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

qmljsinterpreter: Fix directory imports not being found in selector paths

Browse Source 
Previously qml files in selector paths would not properly locate directory imports,
now when an import in a selector path fails we try to go up to the next non-selector
directory and look for the imported directory there.

Fixes: QTCREATORBUG-25127
Change-Id: Ib9b364981b49068637aa97d6f75abf7f1f5878cc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Maximilian Goldstein
2021-12-03 14:39:52 +01:00
parent e09bb8017d
commit 708e0fc06f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -2258,6 +2258,14 @@ ImportInfo ImportInfo::pathImport(const QString &docPath, const QString &path,
? ImportType::QrcDirectory ? ImportType::QrcDirectory
: ImportType::QrcFile; : ImportType::QrcFile;
} else { } else {
QDir dir(docPath);
while (dir.dirName().startsWith("+"))
dir.cdUp();
const QString docPathStripped = dir.absolutePath();
if (docPathStripped != docPath)
return pathImport(docPathStripped, path, version, as, ast);
info.m_type = ImportType::UnknownFile; info.m_type = ImportType::UnknownFile;
} }
info.m_version = version; info.m_version = version;