diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
| commit | 3cb56800d581dabd18e354a24f018c55bd91f748 (patch) | |
| tree | 9b8e95cf62e22026463a0f87a3625b279f457aad /src/corelib/global/qglobal.h | |
| parent | aed7540d45096791d1a824f500694a15426fd94b (diff) | |
| parent | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index cf647ea20d..f9d7a1c43f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1071,9 +1071,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 = {}; #endif #endif |