[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-37-gab91ed9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 0581ff763d9656ab819504b51398f34362cf4989
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:27:35 2015 -0300

    Delete qtsystemtrayicon_handle_submenus_correctly.patch
    
    Already present upstream.
---
 debian/changelog                                   |  1 +
 ...tsystemtrayicon_handle_submenus_correctly.patch | 88 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b99fa18..290b610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
   * Bump qtbase-abi to 5-4-2.
   * Refresh gnukfreebsd.diff.
   * Delete patches backported from upstream already present in this release:
+    - cve-2015-0295.diff
     - qtsystemtrayicon_handle_submenus_correctly.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
diff --git a/debian/patches/qtsystemtrayicon_handle_submenus_correctly.patch b/debian/patches/qtsystemtrayicon_handle_submenus_correctly.patch
deleted file mode 100644
index 93b92ce..0000000
--- a/debian/patches/qtsystemtrayicon_handle_submenus_correctly.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 03dc2b2e82750d1c531cf00a406368cde4a8928b Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Sun, 11 Jan 2015 12:05:55 +0300
-Subject: [PATCH] QSystemTrayIcon: handle submenus correctly
-
-This fixes a bug when submenus are shown as simple actions when
-a platform system tray icon is used.
-
-To correctly handle submenus, we need to set platform menus on
-all submenus, and only then on a parent menu.
-
-Change-Id: If2bfcc703b938dbb14ba4b9aa810039ced07e946
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint at theqtcompany.com>
-Reviewed-by: Dimitrios Glentadakis <dglent at free.fr>
-Reviewed-by: Shawn Rutledge <shawn.rutledge at digia.com>
----
- src/widgets/util/qsystemtrayicon.cpp | 28 +++++++++++++++++++++++-----
- src/widgets/util/qsystemtrayicon_p.h |  1 +
- 2 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
-index 7d04cab..d151e57 100644
---- a/src/widgets/util/qsystemtrayicon.cpp
-+++ b/src/widgets/util/qsystemtrayicon.cpp
-@@ -37,6 +37,7 @@
- #ifndef QT_NO_SYSTEMTRAYICON
- 
- #include "qmenu.h"
-+#include "qlist.h"
- #include "qevent.h"
- #include "qpoint.h"
- #include "qlabel.h"
-@@ -704,11 +705,7 @@ void QSystemTrayIconPrivate::updateIcon_sys_qpa()
- void QSystemTrayIconPrivate::updateMenu_sys_qpa()
- {
-     if (menu) {
--        if (!menu->platformMenu()) {
--            QPlatformMenu *platformMenu = qpa_sys->createMenu();
--            if (platformMenu)
--                menu->setPlatformMenu(platformMenu);
--        }
-+        addPlatformMenu(menu);
-         qpa_sys->updateMenu(menu->platformMenu());
-     }
- }
-@@ -741,6 +738,27 @@ void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message,
-                      static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
- }
- 
-+void QSystemTrayIconPrivate::addPlatformMenu(QMenu *menu) const
-+{
-+    if (menu->platformMenu())
-+        return; // The platform menu already exists.
-+
-+    // The recursion depth is the same as menu depth, so should not
-+    // be higher than 3 levels.
-+    QListIterator<QAction *> it(menu->actions());
-+    while (it.hasNext()) {
-+        QAction *action = it.next();
-+        if (action->menu())
-+            addPlatformMenu(action->menu());
-+    }
-+
-+    // This menu should be processed *after* its children, otherwise
-+    // setMenu() is not called on respective QPlatformMenuItems.
-+    QPlatformMenu *platformMenu = qpa_sys->createMenu();
-+    if (platformMenu)
-+        menu->setPlatformMenu(platformMenu);
-+}
-+
- QT_END_NAMESPACE
- 
- #endif // QT_NO_SYSTEMTRAYICON
-diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
-index 0dda689..f05bf9e 100644
---- a/src/widgets/util/qsystemtrayicon_p.h
-+++ b/src/widgets/util/qsystemtrayicon_p.h
-@@ -99,6 +99,7 @@ private:
-     void updateMenu_sys_qpa();
-     QRect geometry_sys_qpa() const;
-     void showMessage_sys_qpa(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs);
-+    void addPlatformMenu(QMenu *menu) const;
- };
- 
- class QBalloonTip : public QWidget
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 3c697f7..434a513 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-qtsystemtrayicon_handle_submenus_correctly.patch
 xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
 require_fpic_instead_of_fpie.patch
 try_to_ensure_that_fpic_is_used_in_cmake_builds.patch

-- 
qtbase packaging