Fix moc generated code with dummy Q_PROPERTY

If there is properties, we cannot skip the code that substract
the property number from the id

Task-number: QTBUG-5590
Reviewed-by: Brad

1 files changed, 0 insertions, 11 deletions

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 8fcc0df..1a75cf6 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -725,16 +725,6 @@ void Generator::generateMetacall()
             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)
@@ -904,7 +894,6 @@ void Generator::generateMetacall()
 
         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");