From 3d45683edfb6e2924aeaf72a2e462b1456df65cb Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 2 Mar 2023 12:10:06 +0100 Subject: [PATCH] QMake: Avoid some explicit use of environment iterators Task-number: QTCREATORBUG-28357 Change-Id: I80eae26eb1e7c7202654acdd3eb9380934bb7347 Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 6d840187251..575de11f66c 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -872,9 +872,9 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi rootProFileName, deviceRoot()); - Environment::const_iterator eit = env.constBegin(), eend = env.constEnd(); - for (; eit != eend; ++eit) - m_qmakeGlobals->environment.insert(env.key(eit), env.expandedValueForKey(env.key(eit))); + env.forEachEntry([&](const QString &key, const QString &, bool) { + m_qmakeGlobals->environment.insert(key, env.expandedValueForKey(key)); + }); m_qmakeGlobals->setCommandLineArguments(rootProFileName, qmakeArgs); m_qmakeGlobals->runSystemFunction = bc->runSystemFunction();