diff options
| author | Andreas Holzammer <andreas.holzammer.qnx@kdab.com> | 2013-03-15 15:19:51 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-19 11:35:11 +0100 |
| commit | b079d623e86307337d14a2187fd16f86aab86dd8 (patch) | |
| tree | 3a4837ac2c718d795c59580db003bccab28ce075 | |
| parent | 0c78cd6b343340a80397b47f7addba7da3db240b (diff) | |
[QNX] Fix qmake environment resolving
Use the updateEnvironment function instead of
checking manually the env.
Change-Id: I20cba82dab833359854d786ec6403c4bfe417243
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/qnx/qnxabstractqtversion.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/qnx/qnxabstractqtversion.cpp b/src/plugins/qnx/qnxabstractqtversion.cpp index f01305b958..f9ce0dc77d 100644 --- a/src/plugins/qnx/qnxabstractqtversion.cpp +++ b/src/plugins/qnx/qnxabstractqtversion.cpp @@ -103,12 +103,8 @@ void QnxAbstractQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils Utils::Environment QnxAbstractQtVersion::qmakeRunEnvironment() const { - if (!m_environmentUpToDate && !sdkPath().isEmpty()) - { - // TODO: return Utils::Environment instead(?) - m_envMap = QnxUtils::parseEnvironmentFile(QnxUtils::envFilePath(sdkPath())); - m_environmentUpToDate = true; - } + if (!sdkPath().isEmpty()) + updateEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment(); QnxUtils::prependQnxMapToEnvironment(m_envMap, env); |