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

QmlJS: Fix compile for Qt5.14

Browse Source 
Amends 5ad724a3ac.

Change-Id: Ie53a738b61e2de84083fc6c9d3422451df9358c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-03-19 15:49:26 +01:00
committed by David Schulz
parent 5b13fb2168
commit 7d3a23a693
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,7 +615,9 @@ ModelManagerInterface::ProjectInfo ModelManagerInterface::projectInfoForPath(
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);
res.moduleMappings.insert(pInfo.moduleMappings); auto end = pInfo.moduleMappings.cend();
for (auto it = pInfo.moduleMappings.cbegin(); it != end; ++it)
res.moduleMappings.insert(it.key(), it.value());
} }
res.applicationDirectories = Utils::filteredUnique(res.applicationDirectories); res.applicationDirectories = Utils::filteredUnique(res.applicationDirectories);
return res; return res;