whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Marc Mutz 2021-11-25 10:25:35 +01:00
parent 20ab12d181
commit 31f155d985
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
View File

@ -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

8
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h
View File

@ -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