[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu5-4-g52c6b9f

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=52c6b9f

The following commit has been merged in the ubuntu branch:
commit 52c6b9f162c49c4408da07f0e8226368caf1d43a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Sep 27 14:35:03 2016 +0300

    Add debian/patches/dbustray_cleanup_notifier.diff.
    
    Fix a bug in QSystemTrayIcon code where the notifier was not cleaned
    up and the callback was called multiple times.
---
 debian/changelog                              |  3 +++
 debian/patches/dbustray_cleanup_notifier.diff | 17 +++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ed83922..bcb408b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 qtbase-opensource-src (5.6.1+dfsg-3ubuntu6) UNRELEASED; urgency=medium
 
   * Mark allow_native_menubar.diff as applied upstream.
+  * debian/patches/dbustray_cleanup_notifier.diff:
+    - Fix a bug in QSystemTrayIcon code where the notifier was not cleaned
+      up and the callback was called multiple times.
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 27 Sep 2016 14:19:18 +0300
 
diff --git a/debian/patches/dbustray_cleanup_notifier.diff b/debian/patches/dbustray_cleanup_notifier.diff
new file mode 100644
index 0000000..3984c48
--- /dev/null
+++ b/debian/patches/dbustray_cleanup_notifier.diff
@@ -0,0 +1,17 @@
+Description: dbustray: delete m_notifier in QDBusTrayIcon::cleanup()
+ This fixes a bug where notificationClosed() and actionInvoked() slots
+ were called more than once, from previous alive notifier instances.
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=63656dbed7bd2b3e
+Last-Update: 2016-09-27
+
+--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
++++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
+@@ -118,6 +118,8 @@
+         dBusConnection()->unregisterTrayIcon(this);
+     delete m_dbusConnection;
+     m_dbusConnection = Q_NULLPTR;
++    delete m_notifier;
++    m_notifier = Q_NULLPTR;
+     m_registered = false;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e9390c4..eec8632 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,7 @@ QtWidgets-Send-show-hide-event-to-children-on-restor.patch
 dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch
 QMenuBar-Get-rid-of-QMenuBarPrivate-nativeMenuBar.patch
 allow_native_menubar.diff
+dbustray_cleanup_notifier.diff
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging