forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -112,7 +112,7 @@ bool AddQtOperation::setArguments(const QStringList &args)
|
||||
return false;
|
||||
}
|
||||
++i; // skip next;
|
||||
m_qmake = next;
|
||||
m_qmake = QDir::fromNativeSeparators(next);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user