Commit cc93a08b authored by Tobias Hunger's avatar Tobias Hunger

Fix use of SUBST drives and symbian

Task-number: QTCREATORBUG-1224
Reviewed-by: aportale
parent 6324bf44
......@@ -44,8 +44,10 @@ using namespace Qt4ProjectManager::Internal;
static QString gcceCommand(const QString &dir)
{
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
if (!dir.isEmpty())
if (!dir.isEmpty()) {
env.prependOrSetPath(dir + QLatin1String("/bin"));
env.prependOrSetPath(dir);
}
QString gcce = QLatin1String("arm-none-symbianelf-gcc");
#ifdef Q_OS_WIN
gcce += QLatin1String(".exe");
......
......@@ -549,7 +549,9 @@ QList<ProjectExplorer::HeaderPath> S60ToolChainMixin::epocHeaderPaths() const
void S60ToolChainMixin::addEpocToEnvironment(ProjectExplorer::Environment *env) const
{
const QString epocRootPath(S60Devices::cleanedRootPath(m_device.epocRoot));
QString epocRootPath(m_device.epocRoot);
if (!epocRootPath.endsWith(QChar('/')))
epocRootPath.append(QChar('/'));
env->prependOrSetPath(QDir::toNativeSeparators(epocRootPath + QLatin1String("epoc32/tools"))); // e.g. make.exe
env->prependOrSetPath(QDir::toNativeSeparators(epocRootPath + QLatin1String("epoc32/gcc/bin"))); // e.g. gcc.exe
......@@ -559,7 +561,7 @@ void S60ToolChainMixin::addEpocToEnvironment(ProjectExplorer::Environment *env)
if (!sbsHome.isEmpty())
env->prependOrSetPath(sbsHome + QDir::separator() + QLatin1String("bin"));
// No longer set EPOCDEVICE as it conflicts with packaging
env->set(QLatin1String("EPOCROOT"), QDir::toNativeSeparators(epocRootPath));
env->set(QLatin1String("EPOCROOT"), QDir::toNativeSeparators(S60Devices::cleanedRootPath(epocRootPath)));
}
static const char *gnuPocHeaderPathsC[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment