[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-15-gfaa317a

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu branch:
commit faa317afb2a76b670a770392becfd30bb000341e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 3 12:53:25 2016 +0300

    Add a distro patch to stop setting AA_DontUseNativeMenuBar unconditionally.
    
    We want this attribute to be false by default, but applications should be
    able to override it.
---
 debian/changelog                         |  3 +++
 debian/patches/allow_native_menubar.diff | 27 +++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d31ce95..95644d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
     + dbusmenu_exclusive_groups.diff (fix for radio actions)
     + qplatformmenubar_createmenu.diff (adding a method to QPlatformMenuBar)
     + dbusmenu_global_menu.diff (add support for D-Bus global menus)
+  * Add a distro patch to stop setting AA_DontUseNativeMenuBar unconditionally
+    (allow_native_menubar.diff): we want this attribute to be false by default,
+    but applications should be able to override it.
 
  -- Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>  Wed, 17 Aug 2016 09:58:32 +0000
 
diff --git a/debian/patches/allow_native_menubar.diff b/debian/patches/allow_native_menubar.diff
new file mode 100644
index 0000000..c0581b6
--- /dev/null
+++ b/debian/patches/allow_native_menubar.diff
@@ -0,0 +1,27 @@
+Description: do not set Qt::AA_DontUseNativeMenuBar unconditionally
+ This breaks the global menus on Unity desktop.
+ .
+ Instead of setting it forcefully to false in QGenericUnixTheme, I would
+ prefer to not set this attribute at all in Qt code, to allow application
+ developers to override this attribute if needed.
+ .
+ This cannot be forwarded as is, and needs to be discussed with upstream
+ developers first.
+Author: Dmitry Shachnev <mitya57 at ubuntu.com>
+Forwarded: no
+Last-Update: 2016-09-03
+
+--- a/src/gui/kernel/qguiapplication.cpp
++++ b/src/gui/kernel/qguiapplication.cpp
+@@ -1156,11 +1156,6 @@
+ 
+ void QGuiApplicationPrivate::createPlatformIntegration()
+ {
+-    // Use the Qt menus by default. Platform plugins that
+-    // want to enable a native menu implementation can clear
+-    // this flag.
+-    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
+-
+ 
+     QHighDpiScaling::initHighDpiScaling();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5b0cdac..149c63b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ skip-largefile-test-s390x.patch
 net-bearer-nm-disconnect-ap-signals7.patch
 qnam-ubuntu-fix6.patch
 disable_overlay_scrollbars.diff
+allow_native_menubar.diff

-- 
qtbase packaging