diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 2a3b961b039731adf2219ced11024344c20fe8c1..62105009948054d96da87ae02fe9eb3d4ddb1be9 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")); }