From ad17ea9611045747fa2e6bb2b1d10e313a0efe15 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 24 Jun 2020 19:34:31 +0200 Subject: [PATCH] QmlJS: Fix false positives for Connections Connections and ListElement are in the QtQml scope, when using type information from Qt kit. Change-Id: I6236a317117e15f4b68c0642186bfdb91d0c92db Reviewed-by: Ulf Hermann Reviewed-by: Christian Kamm --- src/libs/qmljs/qmljsscopebuilder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp index ca59e74dcaf..86467a911c2 100644 --- a/src/libs/qmljs/qmljsscopebuilder.cpp +++ b/src/libs/qmljs/qmljsscopebuilder.cpp @@ -176,10 +176,10 @@ void ScopeBuilder::setQmlScopeObject(Node *node) while (iter.hasNext()) { const ObjectValue *prototype = iter.next(); if (const CppComponentValue *qmlMetaObject = value_cast(prototype)) { - if ((qmlMetaObject->className() == QLatin1String("ListElement") - || qmlMetaObject->className() == QLatin1String("Connections") - ) && (qmlMetaObject->moduleName() == QLatin1String("Qt") - || qmlMetaObject->moduleName() == QLatin1String("QtQuick"))) { + if ((qmlMetaObject->className() == "ListElement" + || qmlMetaObject->className() == "Connections") + && (qmlMetaObject->moduleName() == "Qt" || qmlMetaObject->moduleName() == "QtQml" + || qmlMetaObject->moduleName() == "QtQuick")) { qmlScopeObjects.clear(); break; }