diff options
| author | Fathi Boudra <fabo@debian.org> | 2008-08-05 15:18:37 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2008-08-05 15:18:37 +0000 |
| commit | e666ad9f0eec4186554f87027b32a2ec839917dc (patch) | |
| tree | 1de2eec29e5951822ff086b8088739100843fd83 | |
| parent | 8d823c25d5a72627fb0ee145ca251154bc33cab1 (diff) | |
| download | qt4-x11-e666ad9f0eec4186554f87027b32a2ec839917dc.tar.gz | |
Add patch to fix systray under KDE 4.
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/0242-fix-systray.diff | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index edab658..cb1f7b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@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) diff --git a/debian/patches/0242-fix-systray.diff b/debian/patches/0242-fix-systray.diff new file mode 100644 index 0000000..69e991b --- /dev/null +++ b/debian/patches/0242-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. + +--- 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/series b/debian/patches/series index 2cf25b9..75bcbfa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 |