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

Fix upgrade of Symbian Qt versions from 2.1

Browse Source 
SBSv2 support has changed a bit.

Reviewed-by: Pawel Polanski
This commit is contained in:
Tobias Hunger
2011-04-14 11:36:16 +02:00
parent 7328bce8a6
commit c7c9238259
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1701,6 +1701,16 @@ QString QtVersion::sbsV2Directory() const
void QtVersion::setSbsV2Directory(const QString &directory) void QtVersion::setSbsV2Directory(const QString &directory)
{ {
QDir dir(directory);
if (dir.exists(QLatin1String("sbs"))) {
m_sbsV2Directory = dir.absolutePath();
return;
}
dir.cd("bin");
if (dir.exists(QLatin1String("sbs"))) {
m_sbsV2Directory = dir.absolutePath();
return;
}
m_sbsV2Directory = directory; m_sbsV2Directory = directory;
} }
@@ -1753,11 +1763,14 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const
// SBSv2: // SBSv2:
if (isBuildWithSymbianSbsV2()) { if (isBuildWithSymbianSbsV2()) {
QString sbsHome(env.value(QLatin1String("SBS_HOME"))); QString sbsHome(env.value(QLatin1String("SBS_HOME")));
if (!m_sbsV2Directory.isEmpty()) { QString sbsConfig = sbsV2Directory();
env.prependOrSetPath(m_sbsV2Directory + QLatin1String("/bin")); if (!sbsConfig.isEmpty()) {
env.set(QLatin1String("SBS_HOME"), m_sbsV2Directory); // We need this for Qt 4.6.3 compatibility env.prependOrSetPath(sbsConfig);
// SBS_HOME is the path minus the trailing /bin:
env.set(QLatin1String("SBS_HOME"),
QDir::toNativeSeparators(sbsConfig.left(sbsConfig.count() - 4))); // We need this for Qt 4.6.3 compatibility
} else if (!sbsHome.isEmpty()) { } else if (!sbsHome.isEmpty()) {
env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin")); env.prependOrSetPath(sbsHome + QLatin1String("/bin"));
} }
} }
} }