From 6a2490c3811b106ba94c390a982e8ac60dc5f96c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 7 Apr 2011 14:56:23 +0200 Subject: [PATCH] Symbian: Be more clever about figuring out SBS path --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index ceb8571d0f8..4a2f960bea7 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1694,6 +1694,12 @@ QString QtVersion::qtCorePath() const QString QtVersion::sbsV2Directory() const { + QDir dir(m_sbsV2Directory); + if (dir.exists(QLatin1String("sbs"))) + return dir.absolutePath(); + dir.cd("bin"); + if (dir.exists(QLatin1String("sbs"))) + return dir.absolutePath(); return m_sbsV2Directory; } @@ -1752,7 +1758,7 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const if (isBuildWithSymbianSbsV2()) { QString sbsHome(env.value(QLatin1String("SBS_HOME"))); if (!m_sbsV2Directory.isEmpty()) { - env.prependOrSetPath(m_sbsV2Directory + QLatin1String("/bin")); + env.prependOrSetPath(sbsV2Directory()); 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"));