diff options
author | Marc Mutz <marc.mutz@qt.io> | 2021-11-25 10:25:35 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2021-12-07 09:06:18 +0100 |
commit | 31f155d985f20f96043f339c115433e7e9edbaab (patch) | |
tree | 71c3f407803eb1d9ae41acd6aab447ab8bd81d12 /tests/auto | |
parent | 20ab12d18133c41376305283c2df9f2c95e3634d (diff) |
tst_qmetatype: move an #ifdef to the header
... so it can be used by multiple .cpp files.
Task-number: QTQAINFRA-4669
Change-Id: I7212b9b08cd3bfa44ee741ee4789d1d0024e4708
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto')
-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 a59d809da7..f2e986e1b5 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 fecd5d75c6..fbb5cfdb64 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 |