From 380d2025fb8d6187929bbd8f803c8ba281e232e4 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 21 Feb 2012 16:48:38 +0100
Subject: [PATCH] Symbian: RVCT and GCCE environment variables
Fix the RVCT/GCCE environment variables that need to be
set for SBSv2.
Change-Id: I4a0c6dec1ba92b420aab927985853071bffd6642
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp | 3 +--
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index 1eb0cec163f..bad030375db 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 225b5845b02..ceffa421072 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')));
}
--
GitLab