Skip to content
Snippets Groups Projects
Commit b079d623 authored by Andreas Holzammer's avatar Andreas Holzammer Committed by Eike Ziller
Browse files

[QNX] Fix qmake environment resolving


Use the updateEnvironment function instead of
checking manually the env.

Change-Id: I20cba82dab833359854d786ec6403c4bfe417243
Reviewed-by: default avatarTobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: default avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: default avatarMehdi Fekari <mfekari@rim.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 0c78cd6b
No related branches found
No related tags found
No related merge requests found
...@@ -103,12 +103,8 @@ void QnxAbstractQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils ...@@ -103,12 +103,8 @@ void QnxAbstractQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils
Utils::Environment QnxAbstractQtVersion::qmakeRunEnvironment() const Utils::Environment QnxAbstractQtVersion::qmakeRunEnvironment() const
{ {
if (!m_environmentUpToDate && !sdkPath().isEmpty()) if (!sdkPath().isEmpty())
{ updateEnvironment();
// TODO: return Utils::Environment instead(?)
m_envMap = QnxUtils::parseEnvironmentFile(QnxUtils::envFilePath(sdkPath()));
m_environmentUpToDate = true;
}
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
QnxUtils::prependQnxMapToEnvironment(m_envMap, env); QnxUtils::prependQnxMapToEnvironment(m_envMap, env);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment