rev 11854 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

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

Added:
   trunk/packages/qt4-x11/debian/patches/0242-fix-systray.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Add patch to fix systray under KDE 4.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-08-05 15:05:20 UTC (rev 11853)
+++ trunk/packages/qt4-x11/debian/changelog	2008-08-05 15:18:37 UTC (rev 11854)
@@ -1,3 +1,12 @@
+qt4-x11 (4.4.1-2) UNRELEASED; urgency=low
+
+  +++ Changes by Fathi Boudra:
+
+  * Add patch to fix systray under KDE 4.
+    Thanks to Jonathan Riddell and Matthias Kretz.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Aug 2008 17:05:29 +0200
+
 qt4-x11 (4.4.1-1) experimental; urgency=low
 
   * New upstream release. (Closes: #483790)

Added: trunk/packages/qt4-x11/debian/patches/0242-fix-systray.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0242-fix-systray.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0242-fix-systray.diff	2008-08-05 15:18:37 UTC (rev 11854)
@@ -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.
+
+--- a/src/gui/kernel/qwidget.cpp
++++ b/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:05:20 UTC (rev 11853)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-08-05 15:18:37 UTC (rev 11854)
@@ -20,6 +20,7 @@
 0236-qtoolbararealayout-restore.diff
 0238-fix-qt-qttabbar-size.diff
 0241-fix-null-stylesheet-warning.diff
+0242-fix-systray.diff
 
 # debian patches
 01_qmake_for_debian.diff