feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SdkTool: Allow remote paths in various operations

Browse Source 
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>
This commit is contained in:
hjk
2021-11-18 13:05:28 +01:00
parent 2dbe5c72d8
commit 1a6e6825e6
6 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/sdktool/addkitoperation.cpp
View File

@@ -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())