From 9af59838d7ba166966941199354f905b0a122cab Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 19 Jun 2022 10:53:56 -0700 Subject: [PATCH] moc: move the qt_static_metacall below the staticMetaObject Just so we have data structures and functions grouped together. Pick-to: 6.4 Change-Id: Id0fb9ab0089845ee8843fffd16fa171f6e1caf2b Reviewed-by: Fabian Kosmale Reviewed-by: Friedemann Kleint --- src/tools/moc/generator.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index c6384bf340..5958ad7022 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(':', '_'); @@ -409,15 +413,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 // @@ -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; @@ -1403,7 +1404,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)