[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-257-gb51360c

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit f86e8a8a8de2f51729ffa3a634414d1d05ed2fc1
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sat Jun 10 19:21:57 2017 -0500

    Drop global_menu_shortcuts.diff
---
 debian/changelog                          |  1 +
 debian/patches/global_menu_shortcuts.diff | 55 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6134bc..4e156aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
     - qsettings_XDG_CONFIG_DIRS.diff
     - qsettings_simplify_logic.diff
     - vnc_big_endian.diff
+    - global_menu_shortcuts.diff
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/patches/global_menu_shortcuts.diff b/debian/patches/global_menu_shortcuts.diff
deleted file mode 100644
index 8eb6eec..0000000
--- a/debian/patches/global_menu_shortcuts.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: make shortcuts work for platform menu bars
- When a platform menu bar is used, the QMenuBar is hidden, so shortcuts
- for QActions attached only to it do not work.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=287f548d4c7cc594
-Bug: https://bugs.launchpad.net/bugs/1380702
-Last-Update: 2017-01-25
-
---- a/src/widgets/kernel/qshortcut.cpp
-+++ b/src/widgets/kernel/qshortcut.cpp
-@@ -141,9 +141,11 @@
- static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidget *active_window)
- {
-     bool visible = w->isVisible();
--#if defined(Q_OS_DARWIN) && !defined(QT_NO_MENUBAR)
--    if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w))
--        visible = true;
-+#ifndef QT_NO_MENUBAR
-+    if (QMenuBar *menuBar = qobject_cast<QMenuBar *>(w)) {
-+        if (menuBar->isNativeMenuBar())
-+            visible = true;
-+    }
- #endif
- 
-     if (!visible || !w->isEnabled())
---- a/src/widgets/widgets/qmenubar.cpp
-+++ b/src/widgets/widgets/qmenubar.cpp
-@@ -1288,10 +1288,12 @@
-     } else if(e->type() == QEvent::ActionRemoved) {
-         e->action()->disconnect(this);
-     }
--    if (isVisible()) {
-+    // updateGeometries() is also needed for native menu bars because
-+    // it updates shortcutIndexMap
-+    if (isVisible() || isNativeMenuBar())
-         d->updateGeometries();
-+    if (isVisible())
-         update();
--    }
- }
- 
- /*!
-@@ -1708,6 +1710,13 @@
- {
-     Q_Q(QMenuBar);
-     QAction *act = actions.at(id);
-+    if (act && act->menu()) {
-+        if (QPlatformMenu *platformMenu = act->menu()->platformMenu()) {
-+            platformMenu->showPopup(q->windowHandle(), actionRects.at(id), Q_NULLPTR);
-+            return;
-+        }
-+    }
-+
-     setCurrentAction(act, true, true);
-     if (act && !act->menu()) {
-         activateAction(act, QAction::Trigger);
diff --git a/debian/patches/series b/debian/patches/series
index f83a565..5543440 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # Backported from upstream
 Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
-global_menu_shortcuts.diff
 Add-support-for-selecting-the-printer-plugin-via-the.patch
 
 # Debian specific.

-- 
qtbase packaging