From e3c7a74f6826ea05f40bc46e52e380b1a03390a3 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Tue, 1 Jun 2021 16:26:47 +0300
Subject: [PATCH] QmlDesigner: Do not register qml files that are part of
 imported 3D comp

Imported 3D components are handled via different code path, so they
shouldn't be registered for item library in generic qml file
registration.

Fixes: QDS-4404
Change-Id: I840659301a63583bc66102c56de19924830f876b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../metainfo/subcomponentmanager.cpp          | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index e13b8f41376..1d31be37cd3 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -318,7 +318,7 @@ void SubComponentManager::unregisterQmlFile(const QFileInfo &fileInfo, const QSt
 void SubComponentManager::registerQmlFile(const QFileInfo &fileInfo, const QString &qualifier,
                                           bool addToLibrary)
 {
-    if (!model())
+    if (!addToLibrary || !model() || fileInfo.path().contains(QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER)))
         return;
 
     QString componentName = fileInfo.baseName();
@@ -335,22 +335,19 @@ void SubComponentManager::registerQmlFile(const QFileInfo &fileInfo, const QStri
     if (debug)
         qDebug() << "SubComponentManager" << __FUNCTION__ << componentName;
 
-    if (addToLibrary) {
-        // Add file components to the library
-        ItemLibraryEntry itemLibraryEntry;
-        itemLibraryEntry.setType(componentName.toUtf8());
-        itemLibraryEntry.setName(baseComponentName);
+    // Add file components to the library
+    ItemLibraryEntry itemLibraryEntry;
+    itemLibraryEntry.setType(componentName.toUtf8());
+    itemLibraryEntry.setName(baseComponentName);
 #ifndef QMLDESIGNER_TEST
-        itemLibraryEntry.setCategory(ItemLibraryImport::userComponentsTitle());
+    itemLibraryEntry.setCategory(ItemLibraryImport::userComponentsTitle());
 #endif
-        itemLibraryEntry.setCustomComponentSource(fileInfo.absoluteFilePath());
-        if (!qualifier.isEmpty()) {
-            itemLibraryEntry.setRequiredImport(fixedQualifier);
-        }
+    itemLibraryEntry.setCustomComponentSource(fileInfo.absoluteFilePath());
+    if (!qualifier.isEmpty())
+        itemLibraryEntry.setRequiredImport(fixedQualifier);
 
-        if (!model()->metaInfo().itemLibraryInfo()->containsEntry(itemLibraryEntry))
-            model()->metaInfo().itemLibraryInfo()->addEntries({itemLibraryEntry});
-    }
+    if (!model()->metaInfo().itemLibraryInfo()->containsEntry(itemLibraryEntry))
+        model()->metaInfo().itemLibraryInfo()->addEntries({itemLibraryEntry});
 }
 
 Model *SubComponentManager::model() const