[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu4-3-g6c75b53

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 1d9db673ed6f59c9d068f6926568e850ac881d07
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Sep 16 05:12:04 2016 +0000

    debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch:
    
    * debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch:
      - Fix a crasher in qdbusmenu code (LP: #1620937)
---
 debian/changelog                                   |  3 +-
 ...n-t-leave-dangling-pointers-when-menus-ar.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 33a556d..fc00ca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtbase-opensource-src (5.6.1+dfsg-3ubuntu5) UNRELEASED; urgency=medium
 
-  * 
+  * debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch:
+    - Fix a crasher in qdbusmenu code (LP: #1620937)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 16 Sep 2016 05:08:05 +0000
 
diff --git a/debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch b/debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch
new file mode 100644
index 0000000..93a3356
--- /dev/null
+++ b/debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch
@@ -0,0 +1,45 @@
+From 5ca9631d3a0717afb066471ed5eb3b3ed9a9c08a Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Wed, 7 Sep 2016 17:19:19 +0300
+Subject: [PATCH] =?UTF-8?q?dbusmenu:=20Don=E2=80=99t=20leave=20dangling=20?=
+ =?UTF-8?q?pointers=20when=20menus=20are=20destroyed?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Delete references from menu to its containing item, and vice versa.
+
+Fixes https://launchpad.net/bugs/1620937
+
+Task-number: QTBUG-55966
+Change-Id: I58f0f0a90184bee4b0466c28d91c670a34fa65a5
+Reviewed-by: Shawn Rutledge <shawn.rutledge at qt.io>
+---
+ src/platformsupport/dbusmenu/qdbusplatformmenu.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
+index 5c259d5..a5ee52e 100644
+--- a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
++++ b/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
+@@ -60,6 +60,8 @@ QDBusPlatformMenuItem::QDBusPlatformMenuItem(quintptr tag)
+ QDBusPlatformMenuItem::~QDBusPlatformMenuItem()
+ {
+     menuItemsByID.remove(m_dbusID);
++    if (m_subMenu)
++        static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(Q_NULLPTR);
+ }
+ 
+ void QDBusPlatformMenuItem::setTag(quintptr tag)
+@@ -162,6 +164,8 @@ QDBusPlatformMenu::QDBusPlatformMenu(quintptr tag)
+ 
+ QDBusPlatformMenu::~QDBusPlatformMenu()
+ {
++    if (m_containingMenuItem)
++        m_containingMenuItem->setMenu(Q_NULLPTR);
+ }
+ 
+ void QDBusPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 0a7f58d..155008d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@ Fix-the-GCC-version-supporting-Wsuggest-override.patch
 Fix-parsing-of-tzfile-5-POSIX-rule-zone-names-with-b.patch
 Avoid-artifacts-when-hiding-or-closing-a-QOpenGLWidg.patch
 QtWidgets-Send-show-hide-event-to-children-on-restor.patch
+dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging