aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-03-02 16:09:55 +0100
committerUlf Hermann <ulf.hermann@qt.io>2022-03-02 19:32:08 +0100
commit83a2e80971af69c0b54edc79877016abfd3478b9 (patch)
tree7b514a48eae6fa41866d7c58d05c6035112acbb2
parentae441425e2bbc89ec1d8e4d6499e263ef82ead76 (diff)
QmlCompiler: Optimize metaobject retrieval some more
The QObject one didn't take effect, and we don't need the metatype to get a metaobject for QObject or QQmlComponent. Pick-to: 6.3 Change-Id: Ib047d958a79659fe7c5904b2fdc25b72e69b7b2b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--src/qmlcompiler/qqmljscodegenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp b/src/qmlcompiler/qqmljscodegenerator.cpp
index f6cf2f45ae..b3b4ba4984 100644
--- a/src/qmlcompiler/qqmljscodegenerator.cpp
+++ b/src/qmlcompiler/qqmljscodegenerator.cpp
@@ -84,9 +84,9 @@ QString QQmlJSCodeGenerator::metaTypeFromName(const QQmlJSScope::ConstPtr &type)
QString QQmlJSCodeGenerator::metaObject(const QQmlJSScope::ConstPtr &objectType)
{
if (!objectType->isComposite()) {
- if (objectType->internalName() == u"QtObject"_qs
+ if (objectType->internalName() == u"QObject"_qs
|| objectType->internalName() == u"QQmlComponent"_qs) {
- return metaTypeFromType(objectType) + u".metaObject()"_qs;
+ return u'&' + objectType->internalName() + u"::staticMetaObject"_qs;
}
return metaTypeFromName(objectType) + u".metaObject()"_qs;
}