diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-19 14:21:28 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-19 15:15:57 +0000 |
commit | cc817d508fd60f10fb9b2e0c838a6e6ed60d7dcc (patch) | |
tree | 85acfbea3c35627d8c6dbe7a416460ea76d56e23 /src/tools/sdktool | |
parent | a67c7d5bf078de92b7e76a5536037395c38260c9 (diff) | |
download | qt-creator-cc817d508fd60f10fb9b2e0c838a6e6ed60d7dcc.tar.gz |
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: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/tools/sdktool')
-rw-r--r-- | src/tools/sdktool/adddebuggeroperation.cpp | 4 | ||||
-rw-r--r-- | src/tools/sdktool/addkitoperation.cpp | 3 | ||||
-rw-r--r-- | src/tools/sdktool/addqtoperation.cpp | 2 | ||||
-rw-r--r-- | src/tools/sdktool/addtoolchainoperation.cpp | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp index 7c167a5e99..87bc95f198 100644 --- a/src/tools/sdktool/adddebuggeroperation.cpp +++ b/src/tools/sdktool/adddebuggeroperation.cpp @@ -38,6 +38,8 @@ #include "settings.h" +#include <QDir> + #include <iostream> const char VERSION[] = "Version"; @@ -117,7 +119,7 @@ bool AddDebuggerOperation::setArguments(const QStringList &args) if (next.isNull()) return false; ++i; // skip next; - m_binary = next; + m_binary = QDir::fromNativeSeparators(next); continue; } diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 2f02c098db..a56c58050f 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -41,6 +41,7 @@ #include "settings.h" +#include <QDir> #include <QRegExp> #include <iostream> @@ -186,7 +187,7 @@ bool AddKitOperation::setArguments(const QStringList &args) if (next.isNull()) return false; ++i; // skip next; - m_sysRoot = next; + m_sysRoot = QDir::fromNativeSeparators(next); continue; } diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index efdca8f0c0..ab459c2229 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -112,7 +112,7 @@ bool AddQtOperation::setArguments(const QStringList &args) return false; } ++i; // skip next; - m_qmake = next; + m_qmake = QDir::fromNativeSeparators(next); continue; } diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 3a4ce1513e..3fdf9e6b4d 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -40,6 +40,8 @@ #include <iostream> +#include <QDir> + // ToolChain file stuff: const char COUNT[] = "ToolChain.Count"; const char PREFIX[] = "ToolChain."; @@ -100,7 +102,7 @@ bool AddToolChainOperation::setArguments(const QStringList &args) if (current == QLatin1String("--path")) { ++i; // skip next; - m_path = next; + m_path = QDir::fromNativeSeparators(next); continue; } |