feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use qmltypes source id for builtin qmltypes

Browse Source 
The builtin qmltypes have no qmldir. So we use the qmltypes source id
as project source id.

Change-Id: Ied9c74e93c1d329f3bdfc7f3a0960d8e7f7b51c5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2022-04-21 12:11:17 +02:00
parent 8b31c4a0ba
commit 5f04711011
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp
View File

@@ -193,7 +193,7 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths,
for (const QString &qmlTypesPath : qmlTypesPaths) { for (const QString &qmlTypesPath : qmlTypesPaths) {
SourceId sourceId = m_pathCache.sourceId(SourcePath{qmlTypesPath}); SourceId sourceId = m_pathCache.sourceId(SourcePath{qmlTypesPath});
Storage::ProjectData projectData{SourceId{}, sourceId, moduleId, Storage::FileType::QmlTypes}; Storage::ProjectData projectData{sourceId, sourceId, moduleId, Storage::FileType::QmlTypes};
FileState state = parseTypeInfo(projectData, FileState state = parseTypeInfo(projectData,
Utils::PathString{qmlTypesPath}, Utils::PathString{qmlTypesPath},

6
tests/unit/unittest/projectstorageupdater-test.cpp
View File

@@ -872,11 +872,11 @@ TEST_F(ProjectStorageUpdater, UpdateQmlTypesFiles)
Field(&SynchronizationPackage::updatedFileStatusSourceIds, Field(&SynchronizationPackage::updatedFileStatusSourceIds,
UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)), UnorderedElementsAre(qmltypesPathSourceId, qmltypes2PathSourceId)),
Field(&SynchronizationPackage::projectDatas, Field(&SynchronizationPackage::projectDatas,
UnorderedElementsAre(IsProjectData(SourceId{}, UnorderedElementsAre(IsProjectData(qmltypesPathSourceId,
qmltypesPathSourceId, qmltypesPathSourceId,
builtinCppNativeModuleId, builtinCppNativeModuleId,
FileType::QmlTypes), FileType::QmlTypes),
IsProjectData(SourceId{}, IsProjectData(qmltypes2PathSourceId,
qmltypes2PathSourceId, qmltypes2PathSourceId,
builtinCppNativeModuleId, builtinCppNativeModuleId,
FileType::QmlTypes))), FileType::QmlTypes))),
@@ -901,7 +901,7 @@ TEST_F(ProjectStorageUpdater, DontUpdateQmlTypesFilesIfUnchanged)
Field(&SynchronizationPackage::updatedFileStatusSourceIds, Field(&SynchronizationPackage::updatedFileStatusSourceIds,
UnorderedElementsAre(qmltypesPathSourceId)), UnorderedElementsAre(qmltypesPathSourceId)),
Field(&SynchronizationPackage::projectDatas, Field(&SynchronizationPackage::projectDatas,
UnorderedElementsAre(IsProjectData(SourceId{}, UnorderedElementsAre(IsProjectData(qmltypesPathSourceId,
qmltypesPathSourceId, qmltypesPathSourceId,
builtinCppNativeModuleId, builtinCppNativeModuleId,
FileType::QmlTypes))), FileType::QmlTypes))),