From 46be469a36ccac0deedc3aa37130096b19e8523c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Jan 2016 10:52:48 -0600 Subject: [PATCH] purge (unused) disconnect_displays.patch --- qt5-qtbase.spec | 5 ----- ...ensource-src-5.5-disconnect_displays.patch | 22 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 qtbase-opensource-src-5.5-disconnect_displays.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 7fc480d..2280d63 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -73,10 +73,6 @@ Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch # NEEDS REBASE Patch50: qt5-poll.patch -# Qt5 application crashes when connecting/disconnecting displays -# https://bugzilla.redhat.com/show_bug.cgi?id=1083664 -Patch51: qtbase-opensource-src-5.5-disconnect_displays.patch - # Workaround moc/multilib issues # https://bugzilla.redhat.com/show_bug.cgi?id=1290020 # https://bugreports.qt.io/browse/QTBUG-49972 @@ -327,7 +323,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch4 -p1 -b .QTBUG-35459 %patch12 -p1 -b .enable_ft_lcdfilter -#patch51 -p1 -b .disconnect_displays %patch52 -p1 -b .moc_WORDSIZE %if 0%{?rhel} == 6 diff --git a/qtbase-opensource-src-5.5-disconnect_displays.patch b/qtbase-opensource-src-5.5-disconnect_displays.patch deleted file mode 100644 index 16b47d6..0000000 --- a/qtbase-opensource-src-5.5-disconnect_displays.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/gui/kernel/qwindow.cpp 2015-10-30 06:20:01.000000000 -0200 -+++ b/src/gui/kernel/qwindow.cpp 2015-11-05 11:31:10.544561171 -0200 -@@ -373,15 +373,14 @@ - return; - } - if (newScreen != topLevelScreen) { -- const bool shouldRecreate = recreate && windowRecreationRequired(newScreen); -- const bool shouldShow = visibilityOnDestroy && !topLevelScreen; -+ const bool shouldRecreate = recreate/* && windowRecreationRequired(newScreen)*/; - if (shouldRecreate && platformWindow) - q->destroy(); - connectToScreen(newScreen); -- if (shouldShow) -- q->setVisible(true); -- else if (newScreen && shouldRecreate) -+ if (newScreen && shouldRecreate) { - create(true); -+ q->setVisible(visibilityOnDestroy); -+ } - emitScreenChangedRecursion(newScreen); - } - }