From b88f647a611b69a0aa3e18275a3ee1971ada2179 Mon Sep 17 00:00:00 2001
From: Fathi Boudra <fabo@debian.org>
Date: Tue, 5 Aug 2008 15:29:18 +0000
Subject: Added to qt-copy with #0243.

---
 debian/patches/0242-fix-systray.diff | 19 -------------------
 debian/patches/0243-fix-systray.diff | 19 +++++++++++++++++++
 debian/patches/series                |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 debian/patches/0242-fix-systray.diff
 create mode 100644 debian/patches/0243-fix-systray.diff

diff --git a/debian/patches/0242-fix-systray.diff b/debian/patches/0242-fix-systray.diff
deleted file mode 100644
index 69e991b..0000000
--- a/debian/patches/0242-fix-systray.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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;
diff --git a/debian/patches/0243-fix-systray.diff b/debian/patches/0243-fix-systray.diff
new file mode 100644
index 0000000..49ea58d
--- /dev/null
+++ b/debian/patches/0243-fix-systray.diff
@@ -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;
diff --git a/debian/patches/series b/debian/patches/series
index 75bcbfa..7ec7008 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
-- 
cgit v1.2.3