Commit cc817d50 authored by Tobias Hunger's avatar Tobias Hunger

SDKtool: Make sure to use '/' as path separator

All internal paths in Qt Creator are using '/' as path separator.
Make sure to normalize paths set via the SDKtool to that convention.

Change-Id: If7ef250d49686a0f60d08516b718eb7c84a059ef
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent a67c7d5b
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include "settings.h" #include "settings.h"
#include <QDir>
#include <iostream> #include <iostream>
const char VERSION[] = "Version"; const char VERSION[] = "Version";
...@@ -117,7 +119,7 @@ bool AddDebuggerOperation::setArguments(const QStringList &args) ...@@ -117,7 +119,7 @@ bool AddDebuggerOperation::setArguments(const QStringList &args)
if (next.isNull()) if (next.isNull())
return false; return false;
++i; // skip next; ++i; // skip next;
m_binary = next; m_binary = QDir::fromNativeSeparators(next);
continue; continue;
} }
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "settings.h" #include "settings.h"
#include <QDir>
#include <QRegExp> #include <QRegExp>
#include <iostream> #include <iostream>
...@@ -186,7 +187,7 @@ bool AddKitOperation::setArguments(const QStringList &args) ...@@ -186,7 +187,7 @@ bool AddKitOperation::setArguments(const QStringList &args)
if (next.isNull()) if (next.isNull())
return false; return false;
++i; // skip next; ++i; // skip next;
m_sysRoot = next; m_sysRoot = QDir::fromNativeSeparators(next);
continue; continue;
} }
......
...@@ -112,7 +112,7 @@ bool AddQtOperation::setArguments(const QStringList &args) ...@@ -112,7 +112,7 @@ bool AddQtOperation::setArguments(const QStringList &args)
return false; return false;
} }
++i; // skip next; ++i; // skip next;
m_qmake = next; m_qmake = QDir::fromNativeSeparators(next);
continue; continue;
} }
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include <iostream> #include <iostream>
#include <QDir>
// ToolChain file stuff: // ToolChain file stuff:
const char COUNT[] = "ToolChain.Count"; const char COUNT[] = "ToolChain.Count";
const char PREFIX[] = "ToolChain."; const char PREFIX[] = "ToolChain.";
...@@ -100,7 +102,7 @@ bool AddToolChainOperation::setArguments(const QStringList &args) ...@@ -100,7 +102,7 @@ bool AddToolChainOperation::setArguments(const QStringList &args)
if (current == QLatin1String("--path")) { if (current == QLatin1String("--path")) {
++i; // skip next; ++i; // skip next;
m_path = next; m_path = QDir::fromNativeSeparators(next);
continue; continue;
} }
......
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