diff options
Diffstat (limited to 'src/tools/moc/generator.cpp')
-rw-r--r-- | src/tools/moc/generator.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 896a52b561e..84f0d3f45e6 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -239,9 +239,11 @@ void Generator::generateCode() registerEnumStrings(); const bool requireCompleteness = requireCompleteTypes || cdef->requireCompleteMethodTypes; - const bool hasStaticMetaCall = + bool hasStaticMetaCall = (cdef->hasQObject || !cdef->methodList.isEmpty() || !cdef->propertyList.isEmpty() || !cdef->constructorList.isEmpty()); + if (parser->activeQtMode) + hasStaticMetaCall = false; const QByteArray qualifiedClassNameIdentifier = generateQualifiedClassNameIdentifier(cdef->qualified); @@ -471,10 +473,11 @@ static constexpr auto qt_staticMetaObjectRelocatingContent%s = if (!cdef->hasQObject) return; - fprintf(out, "\nconst QMetaObject *%s::metaObject() const\n{\n return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;\n}\n", + fprintf(out, "\nconst QMetaObject *%s::metaObject() const\n{\n" + " return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;\n" + "}\n", cdef->qualified.constData()); - // // Generate smart cast function // @@ -513,6 +516,9 @@ static constexpr auto qt_staticMetaObjectRelocatingContent%s = } fprintf(out, "}\n"); + if (parser->activeQtMode) + return; + // // Generate internal qt_metacall() function // |