moc: move the qt_static_metacall below the staticMetaObject

Just so we have data structures and functions grouped together.

Change-Id: Id0fb9ab0089845ee8843fffd16fa171f6e1caf2b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 9af59838d7ba166966941199354f905b0a122cab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 11 insertions, 10 deletions

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 08146a4347..701622862f 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -246,6 +246,10 @@ void Generator::generateCode()
     registerPropertyStrings();
     registerEnumStrings();
 
+    const bool hasStaticMetaCall =
+            (cdef->hasQObject || !cdef->methodList.isEmpty()
+             || !cdef->propertyList.isEmpty() || !cdef->constructorList.isEmpty());
+
     QByteArray qualifiedClassNameIdentifier = cdef->qualified;
     qualifiedClassNameIdentifier.replace(':', '_');
 
@@ -410,15 +414,6 @@ void Generator::generateCode()
     fprintf(out, "\n       0        // eod\n};\n\n");
 
 //
-// Generate internal qt_static_metacall() function
-//
-    const bool hasStaticMetaCall =
-            (cdef->hasQObject || !cdef->methodList.isEmpty()
-             || !cdef->propertyList.isEmpty() || !cdef->constructorList.isEmpty());
-    if (hasStaticMetaCall)
-        generateStaticMetacall();
-
-//
 // Build extra array
 //
     QList<QByteArray> extraList;
@@ -578,6 +573,12 @@ void Generator::generateCode()
 
     fprintf(out, "    nullptr\n} };\n\n");
 
+//
+// Generate internal qt_static_metacall() function
+//
+    if (hasStaticMetaCall)
+        generateStaticMetacall();
+
     if (!cdef->hasQObject)
         return;
 
@@ -1400,7 +1401,7 @@ void Generator::generateStaticMetacall()
     if (!isUsed_a)
         fprintf(out, "    (void)_a;\n");
 
-    fprintf(out, "}\n\n");
+    fprintf(out, "}\n");
 }
 
 void Generator::generateSignal(FunctionDef *def,int index)