AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qmetatype: remove traces of compiler workarounds again

Browse Source 
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>
This commit is contained in:
Marc Mutz 2021-12-14 14:22:38 +01:00
parent 795e7dd091
commit 0d91ad44a7
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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); \

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

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

4
tests/auto/corelib/kernel/qmetatype/tst_qmetatype3.cpp
View File

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