Commit 17c5ac54 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

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
parent 94169114
......@@ -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"));
}
......
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