From 767cf0e442723488fc4fd60154ff3a84193bf648 Mon Sep 17 00:00:00 2001 From: Bart Vanhauwaert Date: Tue, 22 Nov 2016 10:25:52 +0100 Subject: Exclude QList from Q_DECLARE_METATYPE Special case QList to avoid Q_DECLARE_METATYPE it since it creates conflicts. Copied the WTF specifier for this code from the other special case for QStringList. May need to revisit this issue. --- generator/classgenerator.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/generator/classgenerator.cpp b/generator/classgenerator.cpp index 5d10558..7644bec 100644 --- a/generator/classgenerator.cpp +++ b/generator/classgenerator.cpp @@ -1058,6 +1058,10 @@ void maybeDeclareMetaType(QTextStream &stream, const QString &typeName, if (nameFootPrint == QLatin1String("QStringList")) { return; // ### wtf... } + if (nameFootPrint == QLatin1String("QList")) { + return; // ### wtf2... + } + if (registeredTypeNames.contains(nameFootPrint) || (QMetaType::type(name.toLatin1()) != 0)) return; -- cgit v1.3-18-gd494