diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp index 1eb0cec163f5a6e7869d4b98ce6c8efcbbcce3f1..bad030375dbfd4ffc5043ab2d53f66d8e79d5da5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp @@ -117,8 +117,7 @@ void GcceToolChain::addToEnvironment(Utils::Environment &env) const env.set(QLatin1String("QT_GCCE_VERSION"), m_gcceVersion); QString version = m_gcceVersion; env.set(QString::fromLatin1("SBS_GCCE") + version.remove(QLatin1Char('.')) - + QLatin1String("BIN"), - compilerCommand().toUserOutput()); + + QLatin1String("BIN"), QDir::toNativeSeparators(compilerCommand().toFileInfo().absolutePath())); // Required for SBS, which checks the version output from its tools // and gets confused by localized output. env.set(QLatin1String("LANG"), QString(QLatin1Char('C'))); diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp index 225b5845b02daa8f5f7ca6bb0f5943b259aa9e05..ceffa421072b87fa29835e2e948eb3869d68b43a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp @@ -215,11 +215,12 @@ void RvctToolChain::addToEnvironment(Utils::Environment &env) const env.set(QLatin1String("QT_RVCT_VERSION"), QString::fromLatin1("%1.%2") .arg(m_version.majorVersion).arg(m_version.minorVersion)); - env.set(varName(QLatin1String("BIN")), m_compilerCommand.toUserOutput()); + const QString cxxPath = compilerCommand().toFileInfo().absolutePath(); + env.set(varName(QLatin1String("BIN")), QDir::toNativeSeparators(cxxPath)); // Add rvct to path and set locale to 'C' if (!m_compilerCommand.isEmpty()) - env.prependOrSetPath(m_compilerCommand.toString()); + env.prependOrSetPath(cxxPath); env.set(QLatin1String("LANG"), QString(QLatin1Char('C'))); }