From 17c5ac54ca7e4174c37c8514521772ec316cf361 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 13 Apr 2011 16:03:27 +0200 Subject: [PATCH] Symbian: Always export SBS_HOME when building with SBSv2 Always export SBS_HOME when building with SBSv2, even though that is no longer required. Not doing so breaks Qt 4.6.3 support in the SDK for some people. Task-number: QTCREATORBUG-4487 Reviewed-by: Robert Loehning --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 2d032b93b50..bd4a3fce4eb 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1753,7 +1753,7 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const QString sbsHome(env.value(QLatin1String("SBS_HOME"))); if (!m_sbsV2Directory.isEmpty()) { env.prependOrSetPath(m_sbsV2Directory + QLatin1String("/bin")); - env.unset(QLatin1String("SBS_HOME")); // unset SBS_HOME to prevent SBS from picking it up + env.set(QLatin1String("SBS_HOME"), m_sbsV2Directory); // We need this for Qt 4.6.3 compatibility } else if (!sbsHome.isEmpty()) { env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin")); }