diff options
| author | hjk <hjk@qt.io> | 2021-11-18 13:05:28 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-11-19 13:56:01 +0000 |
| commit | 1a6e6825e6e253c096260ac3e1882c50dd153eaf (patch) | |
| tree | 1e6aeaa8b1c2eacaaef42b60be748e381a457555 /src/tools/sdktool/addkitoperation.cpp | |
| parent | 2dbe5c72d8e9b969c6d669d0801753f82d1d693f (diff) | |
SdkTool: Allow remote paths in various operations
QDir::cleanPath() doesn't work well with the scheme://... syntax.
Change-Id: I2d2a86e416251ea2396b67ab1e5831444d4a979a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/tools/sdktool/addkitoperation.cpp')
| -rw-r--r-- | src/tools/sdktool/addkitoperation.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 8746705ac3..d73dcc9c5d 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -37,7 +37,6 @@ #include "settings.h" -#include <QDir> #include <QRegularExpression> #include <iostream> @@ -185,7 +184,7 @@ bool AddKitOperation::setArguments(const QStringList &args) if (next.isNull()) return false; ++i; // skip next; - m_sysRoot = QDir::fromNativeSeparators(next); + m_sysRoot = next; continue; } @@ -649,7 +648,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t if (!device.isNull()) data << KeyValuePair({kit, DATA, DEVICE_ID}, QVariant(device)); if (!sysRoot.isNull()) - data << KeyValuePair({kit, DATA, SYSROOT}, QVariant(sysRoot)); + data << KeyValuePair({kit, DATA, SYSROOT}, Utils::FilePath::fromUserInput(sysRoot).toVariant()); for (auto i = tcs.constBegin(); i != tcs.constEnd(); ++i) data << KeyValuePair({kit, DATA, TOOLCHAIN, i.key()}, QVariant(i.value())); if (!qtId.isNull()) |