diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
| commit | cae32bd04d117ba2423a8c4db12f8d2d5b809bcb (patch) | |
| tree | 179cc91b4b34b9e7ec587d576e42d89fc13fec43 /src/corelib/kernel/qmetatype.h | |
| parent | e1a70ce495928e8d81e80b11d7dbd4c4913ee438 (diff) | |
| parent | 04f68053df5c90dca6947c6d2a5bb4e6851e62bb (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: I576187a9905802c177ae483e6c29d0f55cf7034d
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e64812b3ae..7b0a9f986b 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1389,10 +1389,6 @@ namespace QtPrivate }; -QT_WARNING_PUSH -// In C++03 mode, clang consider local or unnamed type and throw a warning instead of ignoring them -QT_WARNING_DISABLE_CLANG("-Wunnamed-type-template-args") -QT_WARNING_DISABLE_CLANG("-Wlocal-type-template-args") template<typename T> char qt_getEnumMetaObject(const T&); template<typename T> @@ -1405,7 +1401,6 @@ QT_WARNING_DISABLE_CLANG("-Wlocal-type-template-args") enum { Value = sizeof(qt_getEnumMetaObject(declval())) == sizeof(QMetaObject*) }; }; template<> struct IsQEnumHelper<void> { enum { Value = false }; }; -QT_WARNING_POP template<typename T, typename Enable = void> struct MetaObjectForType |