diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2021-12-14 14:22:38 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2021-12-16 18:45:08 +0100 |
| commit | 0d91ad44a7f47be0aacaa1ca98176e8a51e3997a (patch) | |
| tree | 59b822faa463d6f63f63c087c893096d7126e3ff | |
| parent | 795e7dd091aa51141e7a907940b2d56eec0bc526 (diff) | |
tst_qmetatype: remove traces of compiler workarounds again
Now that all platforms can deal with the full tst_QMetaType again,
remove the last traces of the workaround.
Pick-to: 6.3
Change-Id: I530cab8413f8b68903991b30a1f29b5871877a88
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype3.cpp | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index d7b1ff268a..d4ea231a7e 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -1720,9 +1720,6 @@ void tst_QMetaType::automaticTemplateRegistration_1() QVERIFY(qRegisterMetaType<UnregisteredTypeList>("UnregisteredTypeList") > 0); } -#if !defined(TST_QMETATYPE_BROKEN_COMPILER) - - REGISTER_TYPEDEF(QHash, int, uint) REGISTER_TYPEDEF(QMap, int, uint) @@ -1740,8 +1737,6 @@ void tst_QMetaType::automaticTemplateRegistration_1() CREATE_AND_VERIFY_CONTAINER(QHash, void*, void*) CREATE_AND_VERIFY_CONTAINER(QHash, const void*, const void*) -#endif // !defined(TST_QMETATYPE_BROKEN_COMPILER) - #define TEST_OWNING_SMARTPOINTER(SMARTPOINTER, ELEMENT_TYPE, FLAG_TEST, FROMVARIANTFUNCTION) \ { \ SMARTPOINTER < ELEMENT_TYPE > sp(new ELEMENT_TYPE); \ diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h index d8b0f9412d..65fe3859f0 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h @@ -112,9 +112,7 @@ private slots: void isRegisteredStaticLess(); void isEnum(); void automaticTemplateRegistration_1(); -#ifndef TST_QMETATYPE_BROKEN_COMPILER void automaticTemplateRegistration_2(); // defined in tst_qmetatype3.cpp -#endif void saveAndLoadBuiltin_data(); void saveAndLoadBuiltin(); void saveAndLoadCustom(); @@ -295,7 +293,6 @@ Q_DECLARE_METATYPE(CustomMovable); #define REGISTER_TYPEDEF(TYPE, ARG1, ARG2) \ qRegisterMetaType<TYPE <ARG1, ARG2>>(#TYPE "<" #ARG1 "," #ARG2 ">"); -#if !defined(TST_QMETATYPE_BROKEN_COMPILER) static inline QByteArray createTypeName(const char *begin, const char *va) { QByteArray tn(begin); @@ -314,6 +311,5 @@ static inline QByteArray createTypeName(const char *begin, const char *va) tn += '>'; return tn; } -#endif Q_DECLARE_METATYPE(const void*) diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype3.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype3.cpp index 8dd1eaebb4..52406b1e8d 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype3.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype3.cpp @@ -31,13 +31,9 @@ #include <QtCore/private/qmetaobjectbuilder_p.h> -#if !defined(TST_QMETATYPE_BROKEN_COMPILER) - void tst_QMetaType::automaticTemplateRegistration_2() { FOR_EACH_STATIC_PRIMITIVE_TYPE( PRINT_2ARG_TEMPLATE ) } - -#endif // !defined(TST_QMETATYPE_BROKEN_COMPILER) |