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

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit f4c60b10e32cc87c6a703c87be534f186f30cdc8
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 7 10:34:42 2016 +0000

    Add the missing patch.
---
 ...gcc-Wsuggest-override-warning-on-Q_OBJECT.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/debian/patches/Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch b/debian/patches/Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch
new file mode 100644
index 0000000..cc4c533
--- /dev/null
+++ b/debian/patches/Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch
@@ -0,0 +1,30 @@
+From 4790ccfa7a7dcdaf5b1c3c3f71bd333a6d754fba Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure at kdab.com>
+Date: Wed, 27 Jul 2016 22:57:51 +0200
+Subject: [PATCH] Fix gcc -Wsuggest-override warning on Q_OBJECT
+
+Same reasoning as commit 3092bd5 (which was for Clang), but for gcc >= 5.1.
+
+Change-Id: I123b17670c1a64876b01fd39fb11648fa4e8b1fd
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart at woboq.com>
+---
+ src/corelib/kernel/qobjectdefs.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
+index 8d32795..0a4492d 100644
+--- a/src/corelib/kernel/qobjectdefs.h
++++ b/src/corelib/kernel/qobjectdefs.h
+@@ -173,6 +173,8 @@ 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
++#  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_GCC("-Wsuggest-override")
+ #else
+ #  define Q_OBJECT_NO_OVERRIDE_WARNING
+ #endif
+-- 
+2.9.3
+

-- 
qtbase packaging