Commit 32dd271a authored by Tobias Hunger's avatar Tobias Hunger

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
parent a0dc4979
......@@ -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"));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment