From b079d623e86307337d14a2187fd16f86aab86dd8 Mon Sep 17 00:00:00 2001
From: Andreas Holzammer <andreas.holzammer.qnx@kdab.com>
Date: Fri, 15 Mar 2013 15:19:51 +0100
Subject: [PATCH] [QNX] Fix qmake environment resolving
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
src/plugins/qnx/qnxabstractqtversion.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qnx/qnxabstractqtversion.cpp b/src/plugins/qnx/qnxabstractqtversion.cpp
index f01305b9589..f9ce0dc77d9 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);
--
GitLab