Avoid a few double lookups when expanding environment values

Change-Id: Ie84caee89a48d8006e6324c5a82901d01a5fac6c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-03-02 14:19:42 +01:00
parent 47d375bbb4
commit 08bacd3f19
5 changed files with 10 additions and 10 deletions

View File

@@ -872,8 +872,8 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi
rootProFileName,
deviceRoot());
env.forEachEntry([&](const QString &key, const QString &, bool) {
m_qmakeGlobals->environment.insert(key, env.expandedValueForKey(key));
env.forEachEntry([&](const QString &key, const QString &value, bool) {
m_qmakeGlobals->environment.insert(key, env.expandVariables(value));
});
m_qmakeGlobals->setCommandLineArguments(rootProFileName, qmakeArgs);