From 7d3a23a693a63f25b9e05f4fb2983d579cedf54e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 19 Mar 2021 15:49:26 +0100 Subject: [PATCH] QmlJS: Fix compile for Qt5.14 Amends 5ad724a3ac345. Change-Id: Ie53a738b61e2de84083fc6c9d3422451df9358c6 Reviewed-by: Erik Verbruggen Reviewed-by: David Schulz --- src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index ffcabfc18b7..86e1e7046e9 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -615,7 +615,9 @@ ModelManagerInterface::ProjectInfo ModelManagerInterface::projectInfoForPath( res.applicationDirectories.append(pInfo.applicationDirectories); for (const auto &importPath : pInfo.importPaths) 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); return res;