diff options
| author | Sune Vuorela <debian@pusling.com> | 2008-07-09 00:27:49 +0000 |
|---|---|---|
| committer | Sune Vuorela <debian@pusling.com> | 2008-07-09 00:27:49 +0000 |
| commit | 9577d33324b2c0b220bd842bac75c2e10afd6133 (patch) | |
| tree | 526a02b23c9309e9e96498b35f13f7bf37697b35 | |
| parent | 72f3fd66c010f2af61821a0e265d6db96ddb2435 (diff) | |
| download | qt4-x11-9577d33324b2c0b220bd842bac75c2e10afd6133.tar.gz | |
+++ Changes by Sune Vuorela:
* Add 0235-qdbus-dispatch-async-timeout.diff from qt copy. Acked in qt-copy
by Thiago.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/0235-qdbus-dispatch-async-timeout.diff | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0fbff7b..59641dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ qt4-x11 (4.4.0-4~pre1) unstable; urgency=low - +++ Changes by Sune Vuolera: + +++ Changes by Sune Vuorela: * Get patch from 4.4.2 (yes!) to fix painting of scrollbars in webkit with some styles. @@ -10,6 +10,8 @@ qt4-x11 (4.4.0-4~pre1) unstable; urgency=low See #487745 for details. * Don't make the std:: symbols in webkit public. Solution based on the work of Mike Hommey in the gtk webkit package. + * Add 0235-qdbus-dispatch-async-timeout.diff from qt copy. Acked in qt-copy + by Thiago. +++ Changes by Modestas Vainius: diff --git a/debian/patches/0235-qdbus-dispatch-async-timeout.diff b/debian/patches/0235-qdbus-dispatch-async-timeout.diff new file mode 100644 index 0000000..9fd4796 --- /dev/null +++ b/debian/patches/0235-qdbus-dispatch-async-timeout.diff @@ -0,0 +1,20 @@ +qt-bugs@ issue : none +Trolltech task ID : none +bugs.kde.org number : none +applied: no +author: Michael Leupold <lemma@confuego.org> + +This patch dispatches synthesized timeout messages directly +after handling them. This is neccessary in order to receive timeout +errors to asynchroneous messages. + +--- src/dbus/qdbusintegrator.cpp (Revision 827848) ++++ src/dbus/qdbusintegrator.cpp (Arbeitskopie) +@@ -988,6 +988,7 @@ + { + DBusTimeout *timeout = timeouts.value(e->timerId(), 0); + q_dbus_timeout_handle(timeout); ++ doDispatch(); + } + + void QDBusConnectionPrivate::customEvent(QEvent *e) diff --git a/debian/patches/series b/debian/patches/series index e1c1e0c..6d385f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,6 +21,7 @@ 0233-fix-q3textbrowser-image.diff # debian patches +0235-qdbus-dispatch-async-timeout.diff 01_qmake_for_debian.diff 02_launch_assistant-qt4.diff 03_launch_moc-qt4.diff |