diff options
author | Fathi Boudra <fabo@debian.org> | 2008-08-06 08:41:41 +0000 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2008-08-06 08:41:41 +0000 |
commit | e80b2250cb2967ffc4b8e7f859ef20e0a964ae1d (patch) | |
tree | 86488c17d5450fe2c5d6295975b51d905419f4b3 | |
parent | b88f647a611b69a0aa3e18275a3ee1971ada2179 (diff) | |
download | qt4-x11-e80b2250cb2967ffc4b8e7f859ef20e0a964ae1d.tar.gz |
Remove systray fix from Qt. Fixed in KDE svn.
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/patches/0243-fix-systray.diff | 19 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 0 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index cb1f7b6..53b1c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,6 @@ 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@lists.debian.org> Tue, 05 Aug 2008 17:05:29 +0200 diff --git a/debian/patches/0243-fix-systray.diff b/debian/patches/0243-fix-systray.diff deleted file mode 100644 index 49ea58d..0000000 --- a/debian/patches/0243-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. - ---- 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 7ec7008..2cf25b9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,7 +20,6 @@ 0236-qtoolbararealayout-restore.diff 0238-fix-qt-qttabbar-size.diff 0241-fix-null-stylesheet-warning.diff -0243-fix-systray.diff # debian patches 01_qmake_for_debian.diff |