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

Symbian: Be more clever about figuring out SBS path

Browse Source
This commit is contained in:
Tobias Hunger
2011-04-07 14:56:23 +02:00
parent d8b6837b45
commit 6a2490c381
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1694,6 +1694,12 @@ QString QtVersion::qtCorePath() const
QString QtVersion::sbsV2Directory() 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; return m_sbsV2Directory;
} }
@@ -1752,7 +1758,7 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const
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 + QLatin1String("/bin")); env.prependOrSetPath(sbsV2Directory());
env.unset(QLatin1String("SBS_HOME")); // unset SBS_HOME to prevent SBS from picking it up env.unset(QLatin1String("SBS_HOME")); // unset SBS_HOME to prevent SBS from picking it up
} else if (!sbsHome.isEmpty()) { } else if (!sbsHome.isEmpty()) {
env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin")); env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin"));