From 9ef82deb625fb1d927f90def442b6d914581e6f5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 11 Jun 2024 15:09:49 +0300 Subject: [PATCH] Revert "QmlJSCheck: Ensure that ::createObjectsForImport always works correctly" This reverts commit fa376883f0ce503e0346b1bb680a60df0dab52de. Reverting because this patch causes code model reset to fail often, leading to corruption of code model. Fixes: QDS-11496 Fixes: QDS-11520 Change-Id: Ied04dc34ef9f51e535dfe0772e245bdcb78e908a Reviewed-by: Thomas Hartmann (cherry picked from commit cca73bb927eb5530ec2d104941122784ae070c45) Reviewed-by: Tim Jenssen --- src/libs/qmljs/qmljsinterpreter.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index 5d687d5cd74..a9fa36a5289 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -1493,10 +1493,8 @@ QList CppQmlTypes::createObjectsForImport(const QStri // if it already exists, skip const QString key = qualifiedName(package, fmo->className(), version); - if (m_objectsByQualifiedName.contains(key)) { - exportedObjects.insert(key, m_objectsByQualifiedName.value(key)); + if (m_objectsByQualifiedName.contains(key)) continue; - } ComponentVersion cppVersion; for (const FakeMetaObject::Export &bestExport : std::as_const(bestExports)) {