diff options
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index a59d809da7f..f2e986e1b55 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -37,14 +37,6 @@ #include <algorithm> #include <memory> -/* QNX's compiler requires too many resources, letting the CI system abort the test -* mingw is blacklisted due to issues with gcc 4.8 -* ### TODO: Check if mingw can be safely removed -*/ -#if defined(__MINGW32__) || defined(Q_OS_QNX) -# define TST_QMETATYPE_BROKEN_COMPILER -#endif - Q_DECLARE_METATYPE(QMetaType::Type) namespace CheckTypeTraits diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h index fecd5d75c6b..fbb5cfdb643 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h @@ -48,6 +48,14 @@ struct MessageHandlerCustom : public MessageHandler inline static QString expectedMessage; }; +/* QNX's compiler requires too many resources, letting the CI system abort the test +* mingw is blacklisted due to issues with gcc 4.8 +* ### TODO: Check if mingw can be safely removed +*/ +#if defined(__MINGW32__) || defined(Q_OS_QNX) +# define TST_QMETATYPE_BROKEN_COMPILER +#endif + class tst_QMetaType: public QObject { Q_OBJECT |
