diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qfunctions_winrt.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmath.qdoc | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/corelib/kernel/qfunctions_winrt.cpp b/src/corelib/kernel/qfunctions_winrt.cpp index 3be42d76e9..ea7f2ac671 100644 --- a/src/corelib/kernel/qfunctions_winrt.cpp +++ b/src/corelib/kernel/qfunctions_winrt.cpp @@ -30,9 +30,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifdef Q_OS_WINRT #include "qfunctions_winrt.h" + +#ifdef Q_OS_WINRT + #include "qstring.h" #include "qbytearray.h" #include "qhash.h" diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc index b2c8b42209..b0583d818e 100644 --- a/src/corelib/kernel/qmath.qdoc +++ b/src/corelib/kernel/qmath.qdoc @@ -215,6 +215,7 @@ \snippet code/src_corelib_kernel_qmath.cpp 3 \sa qDegreesToRadians() +*/ /*! \fn quint32 qNextPowerOfTwo(quint32 value) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 55f8fc9b2c..aa8d826ed9 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1364,6 +1364,11 @@ namespace QtPrivate enum { Value = sizeof(checkType(static_cast<T*>(0))) == sizeof(void*) }; }; + +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> @@ -1375,6 +1380,7 @@ namespace QtPrivate // qt_getEnumMetaObject(T) which returns 'char' enum { Value = sizeof(qt_getEnumMetaObject(declval())) == sizeof(QMetaObject*) }; }; +QT_WARNING_POP template<typename T, typename Enable = void> struct MetaObjectForType |