Do not recoginze templated types or pointers as flags.

Those types can never by flags.

This fixes QML as they do not use Q_DECLARE_METATYPE in a way visible to moc.

Patch by Aaron Kennedy
Reviewed-by: Kent Hansen

1 files changed, 2 insertions, 1 deletions

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 1ed6586da1..8fcc0df64b 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -292,7 +292,8 @@ void Generator::generateCode()
     QList<QByteArray> extraList;
     for (int i = 0; i < cdef->propertyList.count(); ++i) {
         const PropertyDef &p = cdef->propertyList.at(i);
-        if (!isVariantType(p.type) && !metaTypes.contains(p.type)) {
+        if (!isVariantType(p.type) && !metaTypes.contains(p.type) && !p.type.contains('*') &&
+                !p.type.contains('<') && !p.type.contains('>')) {
             int s = p.type.lastIndexOf("::");
             if (s > 0) {
                 QByteArray scope = p.type.left(s);