rpms/qt/devel qt-x11-opensource-src-4.4.1-systray.patch, NONE, 1.1 qt.spec, 1.203, 1.204

Than Ngo (than) fedora-extras-commits at redhat.com
Wed Aug 6 08:05:06 UTC 2008


Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20710

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.4.1-systray.patch 
Log Message:
apply patch to fix regression


qt-x11-opensource-src-4.4.1-systray.patch:

--- NEW FILE qt-x11-opensource-src-4.4.1-systray.patch ---
--- qt/src/gui/kernel/qwidget.cpp	2008-08-01 16:08:30.000000000 +0100
+++ qt/src/gui/kernel/qwidget.cpp	2008-08-05 11:22:40.000000000 +0100
@@ -9095,8 +9095,6 @@
         break;
 #endif
     case Qt::WA_NativeWindow:
-        if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
-            parentWidget()->d_func()->enforceNativeChildren();
         if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
             d->createWinId();
         break;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- qt.spec	6 Aug 2008 03:18:59 -0000	1.203
+++ qt.spec	6 Aug 2008 08:04:36 -0000	1.204
@@ -37,6 +37,7 @@
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
+Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
 %define qt_copy 20080805
@@ -277,6 +278,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
+%patch10 -p1 -b .systray
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`




More information about the fedora-extras-commits mailing list