[SCM] qtbase packaging branch, ubuntu, updated. 5.6.1+dfsg-3ubuntu3-3-g9a69f15

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 9a69f15fed7124fbec903455acc88c8679c639a3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 7 08:59:01 2016 +0000

    debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch:
    
    * debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch:
      - Fix GCC -Wsuggest-override warning on Q_OBJECT (LP: #1619483)
---
 debian/changelog                                   |  3 +++
 ...-GCC-version-supporting-Wsuggest-override.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  4 ++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 135aafd..39d6cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu4) UNRELEASED; urgency=medium
   [ Timo Jyrinki ]
   * debian/patches/Make-QDBusConnectionPrivate-relaySignal-be-called-in.patch:
     - Antoher DBus fix needed for telephony-service (LP: #1620945)
+  * debian/patches/Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch
+    debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch:
+    - Fix GCC -Wsuggest-override warning on Q_OBJECT (LP: #1619483)
 
  -- Ubuntu Developers <ubuntu-devel-discuss at ubuntu.com>  Wed, 07 Sep 2016 07:42:31 +0000
 
diff --git a/debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch b/debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch
new file mode 100644
index 0000000..14d627e
--- /dev/null
+++ b/debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch
@@ -0,0 +1,30 @@
+From b5ff98b05362235913861eae744415c237d8cf3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20Molinari?= <loic.molinari at canonical.com>
+Date: Thu, 1 Sep 2016 19:13:32 +0200
+Subject: [PATCH] Fix the GCC version supporting -Wsuggest-override
+
+Q_CC_GNU is (__GNUC__ * 100 + __GNUC_MINOR__), so 510 is 5.10 not
+5.1.0. The first GCC 5 release has support for -Wsuggest-override, so
+it should really be 501.
+
+Change-Id: I7b264af087cd4562ce8720c99b70116d7654ea5f
+---
+ src/corelib/kernel/qobjectdefs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
+index 7ed6088..5cdbef4 100644
+--- a/src/corelib/kernel/qobjectdefs.h
++++ b/src/corelib/kernel/qobjectdefs.h
+@@ -185,7 +185,7 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {}
+ 
+ #if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306
+ #  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override")
+-#elif defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 510
++#elif defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 501
+ #  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_GCC("-Wsuggest-override")
+ #else
+ #  define Q_OBJECT_NO_OVERRIDE_WARNING
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 0ae1021..d79fc37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,9 @@ dbusmenu_exclusive_groups.diff
 qplatformmenubar_createmenu.diff
 dbusmenu_global_menu.diff
 Make-sure-connection-is-not-null-before-using-it.patch
+Make-QDBusConnectionPrivate-relaySignal-be-called-in.patch
+Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch
+Fix-the-GCC-version-supporting-Wsuggest-override.patch
 
 # Debian specific.
 gnukfreebsd.diff
@@ -26,4 +29,3 @@ net-bearer-nm-disconnect-ap-signals7.patch
 qnam-ubuntu-fix6.patch
 disable_overlay_scrollbars.diff
 allow_native_menubar.diff
-Make-QDBusConnectionPrivate-relaySignal-be-called-in.patch

-- 
qtbase packaging