AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moc: move the qt_static_metacall below the staticMetaObject

Browse Source 
Just so we have data structures and functions grouped together.

Pick-to: 6.4
Change-Id: Id0fb9ab0089845ee8843fffd16fa171f6e1caf2b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Thiago Macieira 2022-06-19 10:53:56 -07:00
parent 3335b541e7
commit 9af59838d7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools/moc/generator.cpp
View File

@ -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)