diff options
authorThiago Macieira <>2016-06-03 22:43:03 -0300
committerJani Heikkinen <>2016-06-08 18:34:10 +0000
commite454e986d57bacbc895cc4f476d2b100b782936c (patch)
parent6a75daa99feb0a0c599ef51d26718ea60fd4d0da (diff)
Move the Q_DECL_UNUSED attribute elsewhere to satisfy ICC 17
It doesn't like the attribute there. I think it's a compiler bug, but I can't be sure because the part of the standard dealing with the placement of attributes and where they apply is very complex. Exercise left for the reader to determine if ICC is correct or not to reject it there. Change-Id: I87e17314d8b24ae983b1fffd1454bde826b7bcf4 Reviewed-by: Olivier Goffart (Woboq GmbH) <> Reviewed-by: Simon Hausmann <> Reviewed-by: Frederik Gladhorn <>
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 2081ca8649..118203f720 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1080,9 +1080,9 @@ struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
#if defined(__cpp_variable_templates) && __cpp_variable_templates >= 201304 // C++14
-template <typename... Args> Q_CONSTEXPR QOverload<Args...> qOverload Q_DECL_UNUSED = {};
-template <typename... Args> Q_CONSTEXPR QConstOverload<Args...> qConstOverload Q_DECL_UNUSED = {};
-template <typename... Args> Q_CONSTEXPR QNonConstOverload<Args...> qNonConstOverload Q_DECL_UNUSED = {};
+template <typename... Args> Q_CONSTEXPR Q_DECL_UNUSED QOverload<Args...> qOverload = {};
+template <typename... Args> Q_CONSTEXPR Q_DECL_UNUSED QConstOverload<Args...> qConstOverload = {};
+template <typename... Args> Q_CONSTEXPR Q_DECL_UNUSED QNonConstOverload<Args...> qNonConstOverload = {};