From 31f155d985f20f96043f339c115433e7e9edbaab Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 25 Nov 2021 10:25:35 +0100 Subject: [PATCH] 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 Reviewed-by: Edward Welbourne --- tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 8 -------- 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 #include -/* 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