rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

purge (unused) disconnect_displays.patch

Browse Source
This commit is contained in:
Rex Dieter 2016-01-12 10:52:48 -06:00
parent e25222eb99
commit 46be469a36
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt5-qtbase.spec
View File

@ -73,10 +73,6 @@ Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch
# NEEDS REBASE # NEEDS REBASE
Patch50: qt5-poll.patch 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 # Workaround moc/multilib issues
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020 # https://bugzilla.redhat.com/show_bug.cgi?id=1290020
# https://bugreports.qt.io/browse/QTBUG-49972 # 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 %patch4 -p1 -b .QTBUG-35459
%patch12 -p1 -b .enable_ft_lcdfilter %patch12 -p1 -b .enable_ft_lcdfilter
#patch51 -p1 -b .disconnect_displays
%patch52 -p1 -b .moc_WORDSIZE %patch52 -p1 -b .moc_WORDSIZE
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6

22
qtbase-opensource-src-5.5-disconnect_displays.patch
View File

@ -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);
}
}