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

QmlJS: set and propagate qtVersion in ProjectInfo

Browse Source 
Change-Id: Icbeb3679c8a76c111a5e3503b2c496c28c830342
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fawzi Mohamed
2020-09-29 09:55:41 +02:00
parent 168c3df4c6
commit 45716a4ccc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -130,6 +130,7 @@ ModelManagerInterface::ModelManagerInterface(QObject *parent)
m_defaultProjectInfo.qtQmlPath = QFileInfo( m_defaultProjectInfo.qtQmlPath = QFileInfo(
QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)).canonicalFilePath(); QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)).canonicalFilePath();
m_defaultProjectInfo.qtVersionString = QLibraryInfo::version().toString();
updateImportPaths(); updateImportPaths();
@@ -608,8 +609,10 @@ ModelManagerInterface::ProjectInfo ModelManagerInterface::projectInfoForPath(
ProjectInfo res; ProjectInfo res;
const auto allProjectInfos = allProjectInfosForPath(path); const auto allProjectInfos = allProjectInfosForPath(path);
for (const ProjectInfo &pInfo : allProjectInfos) { for (const ProjectInfo &pInfo : allProjectInfos) {
if (res.qtQmlPath.isEmpty()) if (res.qtQmlPath.isEmpty()) {
res.qtQmlPath = pInfo.qtQmlPath; res.qtQmlPath = pInfo.qtQmlPath;
res.qtVersionString = pInfo.qtVersionString;
}
res.applicationDirectories.append(pInfo.applicationDirectories); res.applicationDirectories.append(pInfo.applicationDirectories);
for (const auto &importPath : pInfo.importPaths) for (const auto &importPath : pInfo.importPaths)
res.importPaths.maybeInsert(importPath); res.importPaths.maybeInsert(importPath);
@@ -1430,8 +1433,10 @@ ViewerContext ModelManagerInterface::getVContext(const ViewerContext &vCtx,
info = projectInfoForPath(doc->fileName()); info = projectInfoForPath(doc->fileName());
ViewerContext defaultVCtx = defaultVContext(res.language, Document::Ptr(nullptr), false); ViewerContext defaultVCtx = defaultVContext(res.language, Document::Ptr(nullptr), false);
ProjectInfo defaultInfo = defaultProjectInfo(); ProjectInfo defaultInfo = defaultProjectInfo();
if (info.qtQmlPath.isEmpty()) if (info.qtQmlPath.isEmpty()) {
info.qtQmlPath = defaultInfo.qtQmlPath; info.qtQmlPath = defaultInfo.qtQmlPath;
info.qtVersionString = defaultInfo.qtVersionString;
}
info.applicationDirectories = Utils::filteredUnique(info.applicationDirectories info.applicationDirectories = Utils::filteredUnique(info.applicationDirectories
+ defaultInfo.applicationDirectories); + defaultInfo.applicationDirectories);
switch (res.flags) { switch (res.flags) {