feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Symbian: Unset SBS_HOME when not needed

Browse Source 
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
This commit is contained in:
Tobias Hunger
2010-11-22 15:38:21 +01:00
parent a0dc497935
commit 32dd271aa9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1603,10 +1603,12 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const
env.set("QTDIR", QDir::toNativeSeparators(versionInfo().value("QT_INSTALL_DATA"))); env.set("QTDIR", QDir::toNativeSeparators(versionInfo().value("QT_INSTALL_DATA")));
if (isBuildWithSymbianSbsV2()) { if (isBuildWithSymbianSbsV2()) {
QString sbsHome(env.value(QLatin1String("SBS_HOME"))); QString sbsHome(env.value(QLatin1String("SBS_HOME")));
if (!m_sbsV2Directory.isEmpty()) if (!m_sbsV2Directory.isEmpty()) {
env.prependOrSetPath(m_sbsV2Directory); 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(sbsHome + QLatin1Char('/') + QLatin1String("bin"));
}
} }
env.prependOrSetPath(versionInfo().value("QT_INSTALL_BINS")); env.prependOrSetPath(versionInfo().value("QT_INSTALL_BINS"));
} }