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

Symbian: Fix pathes

Browse Source 
Fix pathes for Nokia Qt SDK:
 * Set SBS path in one location only
 * Fix up perl path
 * Set path to CMD on windows. Both ABLD and SBSv2 actually need this.
 * Set GCC path only if the directory actually exists

These fixes allow for building both ABLD and SBSv2 based projects in
a clean environment.

Reviewed-by: Tim Jenssen
This commit is contained in:
Tobias Hunger
2010-11-17 10:37:11 +01:00
parent 1800e98ef1
commit 9f824f4165
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1594,8 +1594,13 @@ void QtVersion::setMsvcVersion(const QString &version)
void QtVersion::addToEnvironment(Utils::Environment &env) const
{
env.set("QTDIR", QDir::toNativeSeparators(versionInfo().value("QT_INSTALL_DATA")));
if (isBuildWithSymbianSbsV2() && !m_sbsV2Directory.isEmpty())
env.prependOrSetPath(m_sbsV2Directory);
if (isBuildWithSymbianSbsV2()) {
QString sbsHome(env.value(QLatin1String("SBS_HOME")));
if (!m_sbsV2Directory.isEmpty())
env.prependOrSetPath(m_sbsV2Directory);
else if (!sbsHome.isEmpty())
env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin"));
}
env.prependOrSetPath(versionInfo().value("QT_INSTALL_BINS"));
}