QmlDesigner: Support multiple module ids per type

The type will be use source id and name instead of module id and name as
key.

Task-number: QDS-5236
Task-number: QDS-5238
Change-Id: Ibc9c298dc0a6363b630173ec4981d574cecd02ff
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
index 04733f3ecd..eeb58f0e31 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
@@ -43,11 +43,12 @@ class SourcePathCache;
 class QmlTypesParser : public QmlTypesParserInterface
 {
 public:
-    using PathCache = QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>,
-                                                   NonLockingMutex>;
+    using ProjectStorage = QmlDesigner::ProjectStorage<Sqlite::Database>;
+    using PathCache = QmlDesigner::SourcePathCache<ProjectStorage, NonLockingMutex>;
 
-    QmlTypesParser(PathCache &pathCache)
+    QmlTypesParser(PathCache &pathCache, ProjectStorage &storage)
         : m_pathCache{pathCache}
+        , m_storage{storage}
     {}
 
     void parse(const QString &sourceContent,
@@ -58,5 +59,6 @@ public:
 
 private:
     PathCache &m_pathCache;
+    ProjectStorage &m_storage;
 };
 } // namespace QmlDesigner