From b349e22e7e2e4c65290c3a2db9c7555c53d8ae34 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 9 Jul 2021 11:53:42 +0200 Subject: [PATCH] QMake: Properly use build device environment in more cases Change-Id: I3d9000c1de448bb023a9b9012db06ed400bbe85a Reviewed-by: Christian Stenger --- src/plugins/qtsupport/baseqtversion.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 0ba9d049672..b670482729a 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1178,7 +1178,7 @@ void BaseQtVersion::ensureMkSpecParsed() const QMakeVfs vfs; QMakeGlobals option; applyProperties(&option); - Environment env = Environment::systemEnvironment(); // FIXME: Use build device + Environment env = d->m_qmakeCommand.deviceEnvironment(); setupQmakeRunEnvironment(env); option.environment = env.toProcessEnvironment(); ProMessageHandler msgHandler(true); @@ -1709,7 +1709,7 @@ void BaseQtVersion::addToEnvironment(const Kit *k, Environment &env) const Environment BaseQtVersion::qmakeRunEnvironment() const { - Environment env = Environment::systemEnvironment(); // FIXME: Use build environment + Environment env = d->m_qmakeCommand.deviceEnvironment(); setupQmakeRunEnvironment(env); return env; } @@ -2291,7 +2291,8 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath (const FilePath &qmakePath, bool isAutoDetected, const QString &autoDetectionSource, QString *error) { QHash versionInfo; - if (!BaseQtVersionPrivate::queryQMakeVariables(qmakePath, Environment::systemEnvironment(), &versionInfo, error)) + const Environment env = qmakePath.deviceEnvironment(); + if (!BaseQtVersionPrivate::queryQMakeVariables(qmakePath, env, &versionInfo, error)) return nullptr; FilePath mkspec = BaseQtVersionPrivate::mkspecFromVersionInfo(versionInfo, qmakePath);