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

QMake: Properly use build device environment in more cases

Browse Source 
Change-Id: I3d9000c1de448bb023a9b9012db06ed400bbe85a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-09 11:53:42 +02:00
parent b0aee9ccd9
commit b349e22e7e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1178,7 +1178,7 @@ void BaseQtVersion::ensureMkSpecParsed() const
QMakeVfs vfs; QMakeVfs vfs;
QMakeGlobals option; QMakeGlobals option;
applyProperties(&option); applyProperties(&option);
Environment env = Environment::systemEnvironment(); // FIXME: Use build device Environment env = d->m_qmakeCommand.deviceEnvironment();
setupQmakeRunEnvironment(env); setupQmakeRunEnvironment(env);
option.environment = env.toProcessEnvironment(); option.environment = env.toProcessEnvironment();
ProMessageHandler msgHandler(true); ProMessageHandler msgHandler(true);
@@ -1709,7 +1709,7 @@ void BaseQtVersion::addToEnvironment(const Kit *k, Environment &env) const
Environment BaseQtVersion::qmakeRunEnvironment() const Environment BaseQtVersion::qmakeRunEnvironment() const
{ {
Environment env = Environment::systemEnvironment(); // FIXME: Use build environment Environment env = d->m_qmakeCommand.deviceEnvironment();
setupQmakeRunEnvironment(env); setupQmakeRunEnvironment(env);
return env; return env;
} }
@@ -2291,7 +2291,8 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath
(const FilePath &qmakePath, bool isAutoDetected, const QString &autoDetectionSource, QString *error) (const FilePath &qmakePath, bool isAutoDetected, const QString &autoDetectionSource, QString *error)
{ {
QHash<ProKey, ProString> versionInfo; QHash<ProKey, ProString> versionInfo;
if (!BaseQtVersionPrivate::queryQMakeVariables(qmakePath, Environment::systemEnvironment(), &versionInfo, error)) const Environment env = qmakePath.deviceEnvironment();
if (!BaseQtVersionPrivate::queryQMakeVariables(qmakePath, env, &versionInfo, error))
return nullptr; return nullptr;
FilePath mkspec = BaseQtVersionPrivate::mkspecFromVersionInfo(versionInfo, qmakePath); FilePath mkspec = BaseQtVersionPrivate::mkspecFromVersionInfo(versionInfo, qmakePath);