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

[Dmitry Shachnev]

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

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

    Mark allow_native_menubar.diff as applied upstream.
---
 debian/changelog                         | 1 +
 debian/patches/allow_native_menubar.diff | 8 ++------
 debian/patches/series                    | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d952a06..ed83922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 qtbase-opensource-src (5.6.1+dfsg-3ubuntu6) UNRELEASED; urgency=medium
 
+  * Mark allow_native_menubar.diff as applied upstream.
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 27 Sep 2016 14:19:18 +0300
 
diff --git a/debian/patches/allow_native_menubar.diff b/debian/patches/allow_native_menubar.diff
index c0581b6..00665a1 100644
--- a/debian/patches/allow_native_menubar.diff
+++ b/debian/patches/allow_native_menubar.diff
@@ -4,12 +4,8 @@ Description: do not set Qt::AA_DontUseNativeMenuBar unconditionally
  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
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8cd28ea8850c5365
+Last-Update: 2016-09-27
 
 --- a/src/gui/kernel/qguiapplication.cpp
 +++ b/src/gui/kernel/qguiapplication.cpp
diff --git a/debian/patches/series b/debian/patches/series
index 0fb9fe1..e9390c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@ 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
 QMenuBar-Get-rid-of-QMenuBarPrivate-nativeMenuBar.patch
+allow_native_menubar.diff
 
 # Debian specific.
 gnukfreebsd.diff
@@ -33,4 +34,3 @@ 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