rev 11855 - trunk/packages/qt4-x11/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2008-08-05 15:29:18 +0000 (Tue, 05 Aug 2008)
New Revision: 11855

Added:
   trunk/packages/qt4-x11/debian/patches/0243-fix-systray.diff
Removed:
   trunk/packages/qt4-x11/debian/patches/0242-fix-systray.diff
Modified:
   trunk/packages/qt4-x11/debian/patches/series
Log:
Added to qt-copy with #0243.


Deleted: trunk/packages/qt4-x11/debian/patches/0242-fix-systray.diff

Added: trunk/packages/qt4-x11/debian/patches/0243-fix-systray.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0243-fix-systray.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0243-fix-systray.diff	2008-08-05 15:29:18 UTC (rev 11855)
@@ -0,0 +1,19 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number : 168007
+applied: no
+author: Matthias Kretz
+
+Fix systray issue with Qt4.4.1.
+
+--- src/gui/kernel/qwidget.cpp
++++ src/gui/kernel/qwidget.cpp
+@@ -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;

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-08-05 15:18:37 UTC (rev 11854)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-08-05 15:29:18 UTC (rev 11855)
@@ -20,7 +20,7 @@
 0236-qtoolbararealayout-restore.diff
 0238-fix-qt-qttabbar-size.diff
 0241-fix-null-stylesheet-warning.diff
-0242-fix-systray.diff
+0243-fix-systray.diff
 
 # debian patches
 01_qmake_for_debian.diff