src/tools/moc/generator.cpp
changeset 3 41300fa6a67c
parent 0 1918ee327afb
child 4 3b1da2848fc7
--- a/src/tools/moc/generator.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/tools/moc/generator.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -292,7 +292,8 @@
     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);
@@ -724,16 +725,6 @@
             needEditable |= p.editable.endsWith(')');
             needUser |= p.user.endsWith(')');
         }
-        bool needAnything = needGet
-                            | needSet
-                            | needReset
-                            | needDesignable
-                            | needScriptable
-                            | needStored
-                            | needEditable
-                            | needUser;
-        if (!needAnything)
-            goto skip_properties;
         fprintf(out, "\n#ifndef QT_NO_PROPERTIES\n     ");
 
         if (needElse)
@@ -903,7 +894,6 @@
 
         fprintf(out, "\n#endif // QT_NO_PROPERTIES");
     }
- skip_properties:
     if (methodList.size() || cdef->signalList.size() || cdef->propertyList.size())
         fprintf(out, "\n    ");
     fprintf(out,"return _id;\n}\n");