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

QmlDesigner: Fix ModuleExportedImports

Browse Source 
There are Qml modules and C++ modules. For reexports a Qml import should
reference only a Qml reexport but not a C++ reexport.

Change-Id: I79f50f2b29334c46f915884b7db2155064a3550a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2022-02-17 14:54:47 +01:00
parent f54867e844
commit f6cff719a9
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,7 @@ void addDependencies(Storage::Imports &dependencies,
void addModuleExportedImports(Storage::ModuleExportedImports &imports, void addModuleExportedImports(Storage::ModuleExportedImports &imports,
ModuleId moduleId, ModuleId moduleId,
ModuleId cppModuleId,
const QList<QmlDirParser::Import> &qmldirImports, const QList<QmlDirParser::Import> &qmldirImports,
ProjectStorageInterface &projectStorage) ProjectStorageInterface &projectStorage)
{ {
@@ -155,7 +156,7 @@ void addModuleExportedImports(Storage::ModuleExportedImports &imports,
ModuleId exportedCppModuleId = projectStorage.moduleId( ModuleId exportedCppModuleId = projectStorage.moduleId(
Utils::PathString{qmldirImport.module} + "-cppnative"); Utils::PathString{qmldirImport.module} + "-cppnative");
imports.emplace_back(moduleId, imports.emplace_back(cppModuleId,
exportedCppModuleId, exportedCppModuleId,
Storage::Version{}, Storage::Version{},
Storage::IsAutoVersion::No); Storage::IsAutoVersion::No);
@@ -232,10 +233,15 @@ void ProjectStorageUpdater::updateQmldirs(const QStringList &qmlDirs,
Utils::PathString moduleName{parser.typeNamespace()}; Utils::PathString moduleName{parser.typeNamespace()};
ModuleId moduleId = m_projectStorage.moduleId(moduleName); ModuleId moduleId = m_projectStorage.moduleId(moduleName);
ModuleId cppModuleId = m_projectStorage.moduleId(moduleName + "-cppnative");
auto imports = filterMultipleEntries(parser.imports()); auto imports = filterMultipleEntries(parser.imports());
addModuleExportedImports(package.moduleExportedImports, moduleId, imports, m_projectStorage); addModuleExportedImports(package.moduleExportedImports,
moduleId,
cppModuleId,
imports,
m_projectStorage);
package.updatedModuleIds.push_back(moduleId); package.updatedModuleIds.push_back(moduleId);
const auto qmlProjectDatas = m_projectStorage.fetchProjectDatas(qmlDirSourceId); const auto qmlProjectDatas = m_projectStorage.fetchProjectDatas(qmlDirSourceId);
@@ -245,7 +251,6 @@ void ProjectStorageUpdater::updateQmldirs(const QStringList &qmlDirs,
auto qmlTypes = filterMultipleEntries(parser.typeInfos()); auto qmlTypes = filterMultipleEntries(parser.typeInfos());
if (!qmlTypes.isEmpty()) { if (!qmlTypes.isEmpty()) {
ModuleId cppModuleId = m_projectStorage.moduleId(moduleName + "-cppnative");
parseTypeInfos(qmlTypes, parseTypeInfos(qmlTypes,
filterMultipleEntries(parser.dependencies()), filterMultipleEntries(parser.dependencies()),
imports, imports,

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

@@ -1161,7 +1161,7 @@ TEST_F(ProjectStorageUpdater, SynchronizeQmldirImports)
qmlModuleId, qmlModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::Yes}, IsAutoVersion::Yes},
ModuleExportedImport{exampleModuleId, ModuleExportedImport{exampleCppNativeModuleId,
qmlCppNativeModuleId, qmlCppNativeModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No}, IsAutoVersion::No},
@@ -1169,7 +1169,7 @@ TEST_F(ProjectStorageUpdater, SynchronizeQmldirImports)
builtinModuleId, builtinModuleId,
Storage::Version{2, 1}, Storage::Version{2, 1},
IsAutoVersion::No}, IsAutoVersion::No},
ModuleExportedImport{exampleModuleId, ModuleExportedImport{exampleCppNativeModuleId,
builtinCppNativeModuleId, builtinCppNativeModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No}, IsAutoVersion::No},
@@ -1177,7 +1177,7 @@ TEST_F(ProjectStorageUpdater, SynchronizeQmldirImports)
quickModuleId, quickModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No}, IsAutoVersion::No},
ModuleExportedImport{exampleModuleId, ModuleExportedImport{exampleCppNativeModuleId,
quickCppNativeModuleId, quickCppNativeModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No})), IsAutoVersion::No})),
@@ -1218,7 +1218,7 @@ TEST_F(ProjectStorageUpdater, SynchronizeQmldirImportsWithDoubleEntries)
qmlModuleId, qmlModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::Yes}, IsAutoVersion::Yes},
ModuleExportedImport{exampleModuleId, ModuleExportedImport{exampleCppNativeModuleId,
qmlCppNativeModuleId, qmlCppNativeModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No}, IsAutoVersion::No},
@@ -1226,7 +1226,7 @@ TEST_F(ProjectStorageUpdater, SynchronizeQmldirImportsWithDoubleEntries)
builtinModuleId, builtinModuleId,
Storage::Version{2, 1}, Storage::Version{2, 1},
IsAutoVersion::No}, IsAutoVersion::No},
ModuleExportedImport{exampleModuleId, ModuleExportedImport{exampleCppNativeModuleId,
builtinCppNativeModuleId, builtinCppNativeModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No}, IsAutoVersion::No},
@@ -1234,7 +1234,7 @@ TEST_F(ProjectStorageUpdater, SynchronizeQmldirImportsWithDoubleEntries)
quickModuleId, quickModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No}, IsAutoVersion::No},
ModuleExportedImport{exampleModuleId, ModuleExportedImport{exampleCppNativeModuleId,
quickCppNativeModuleId, quickCppNativeModuleId,
Storage::Version{}, Storage::Version{},
IsAutoVersion::No})), IsAutoVersion::No})),