From 32dd271aa9f700a9c92d1a7d87160a72e2653782 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 22 Nov 2010 15:38:21 +0100
Subject: [PATCH] Symbian: Unset SBS_HOME when not needed
Unset SBS_HOME when none is needed. This prevents SBS from getting
confused about where its dependencies are located.
Task-number: QTCREATORBUG-3145
Reviewed-by: Alessandro Portale
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 2a3b961b039..62105009948 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1603,10 +1603,12 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const
env.set("QTDIR", QDir::toNativeSeparators(versionInfo().value("QT_INSTALL_DATA")));
if (isBuildWithSymbianSbsV2()) {
QString sbsHome(env.value(QLatin1String("SBS_HOME")));
- if (!m_sbsV2Directory.isEmpty())
+ if (!m_sbsV2Directory.isEmpty()) {
env.prependOrSetPath(m_sbsV2Directory);
- else if (!sbsHome.isEmpty())
+ env.unset(QLatin1String("SBS_HOME")); // unset SBS_HOME to prevent SBS from picking it up
+ } else if (!sbsHome.isEmpty()) {
env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin"));
+ }
}
env.prependOrSetPath(versionInfo().value("QT_INSTALL_BINS"));
}
--
GitLab