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

QmlJS: Fix handling multiple import paths into same module

Browse Source 
It is possible to import components of different paths to fill
a module.
Take further paths into account when looking up types.

Fixes: QTCREATORBUG-24405
Change-Id: I8d6bf0a324ea9c0d1fe9d91b40857f91f00dd662
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
This commit is contained in:
Christian Stenger
2021-01-11 14:09:51 +01:00
parent 7dc72c533e
commit 6ea088c02f
5 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qmljs/qmljsplugindumper.cpp
View File

@@ -421,16 +421,17 @@ QString PluginDumper::buildQmltypesPath(const QString &name) const
version = m.captured("major") + QLatin1Char('.') + m.captured("minor");
}
const QString path = modulePath(qualifiedName, version, m_modelManager->importPathsNames());
const QStringList paths = modulePaths(qualifiedName, version, m_modelManager->importPathsNames());
if (path.isEmpty())
if (paths.isEmpty())
return QString();
QDirIterator it(path, QStringList { "*.qmltypes" }, QDir::Files);
if (it.hasNext())
return it.next();
for (const QString &path : paths) {
QDirIterator it(path, QStringList { "*.qmltypes" }, QDir::Files);
if (it.hasNext())
return it.next();
}
return QString();
}