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

2
src/tools/sdktool/addabiflavor.cpp
View File

@@ -33,8 +33,6 @@
#include "settings.h" #include "settings.h"
#include <QDir>
#include <iostream> #include <iostream>
static char VERSION[] = "Version"; static char VERSION[] = "Version";

6
src/tools/sdktool/addcmakeoperation.cpp
View File

@@ -35,8 +35,6 @@
#include <iostream> #include <iostream>
#include <QDir>
// CMakeTools file stuff: // CMakeTools file stuff:
const char COUNT[] = "CMakeTools.Count"; const char COUNT[] = "CMakeTools.Count";
const char PREFIX[] = "CMakeTools."; const char PREFIX[] = "CMakeTools.";
@@ -92,7 +90,7 @@ bool AddCMakeOperation::setArguments(const QStringList &args)
if (current == "--path") { if (current == "--path") {
++i; // skip next; ++i; // skip next;
m_path = QDir::fromNativeSeparators(next); m_path = next;
continue; continue;
} }
if (next.isNull()) { if (next.isNull()) {
@@ -211,7 +209,7 @@ QVariantMap AddCMakeOperation::addCMake(const QVariantMap &map, const QString &i
data << KeyValuePair({cm, ID_KEY}, QVariant(id)); data << KeyValuePair({cm, ID_KEY}, QVariant(id));
data << KeyValuePair({cm, DISPLAYNAME_KEY}, QVariant(displayName)); data << KeyValuePair({cm, DISPLAYNAME_KEY}, QVariant(displayName));
data << KeyValuePair({cm, AUTODETECTED_KEY}, QVariant(true)); data << KeyValuePair({cm, AUTODETECTED_KEY}, QVariant(true));
data << KeyValuePair({cm, PATH_KEY}, QVariant(path)); data << KeyValuePair({cm, PATH_KEY}, Utils::FilePath::fromUserInput(path).toVariant());
KeyValuePairList extraList; KeyValuePairList extraList;
foreach (const KeyValuePair &pair, extra) foreach (const KeyValuePair &pair, extra)
extraList << KeyValuePair(QStringList({cm}) << pair.key, pair.value); extraList << KeyValuePair(QStringList({cm}) << pair.key, pair.value);

7
src/tools/sdktool/adddebuggeroperation.cpp
View File

@@ -33,8 +33,6 @@
#include "settings.h" #include "settings.h"
#include <QDir>
#include <iostream> #include <iostream>
const char VERSION[] = "Version"; const char VERSION[] = "Version";
@@ -108,7 +106,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 = QDir::fromNativeSeparators(next); m_binary = next;
continue; continue;
} }
@@ -213,7 +211,8 @@ QVariantMap AddDebuggerOperation::addDebugger(const QVariantMap &map,
data << KeyValuePair(QStringList() << debugger << QLatin1String(ABIS), QVariant(abis)); data << KeyValuePair(QStringList() << debugger << QLatin1String(ABIS), QVariant(abis));
data << KeyValuePair(QStringList() << debugger << QLatin1String(ENGINE_TYPE), QVariant(engine)); data << KeyValuePair(QStringList() << debugger << QLatin1String(ENGINE_TYPE), QVariant(engine));
data << KeyValuePair(QStringList() << debugger << QLatin1String(BINARY), QVariant(binary)); data << KeyValuePair(QStringList() << debugger << QLatin1String(BINARY),
Utils::FilePath::fromUserInput(binary).toVariant());
data << KeyValuePair(QStringList() << QLatin1String(COUNT), QVariant(count + 1)); data << KeyValuePair(QStringList() << QLatin1String(COUNT), QVariant(count + 1));

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

@@ -37,7 +37,6 @@
#include "settings.h" #include "settings.h"
#include <QDir>
#include <QRegularExpression> #include <QRegularExpression>
#include <iostream> #include <iostream>
@@ -185,7 +184,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 = QDir::fromNativeSeparators(next); m_sysRoot = next;
continue; continue;
} }
@@ -649,7 +648,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
if (!device.isNull()) if (!device.isNull())
data << KeyValuePair({kit, DATA, DEVICE_ID}, QVariant(device)); data << KeyValuePair({kit, DATA, DEVICE_ID}, QVariant(device));
if (!sysRoot.isNull()) 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) for (auto i = tcs.constBegin(); i != tcs.constEnd(); ++i)
data << KeyValuePair({kit, DATA, TOOLCHAIN, i.key()}, QVariant(i.value())); data << KeyValuePair({kit, DATA, TOOLCHAIN, i.key()}, QVariant(i.value()));
if (!qtId.isNull()) if (!qtId.isNull())

8
src/tools/sdktool/addqtoperation.cpp
View File

@@ -33,10 +33,12 @@
#include "settings.h" #include "settings.h"
#include <QDir> #include <utils/filepath.h>
#include <iostream> #include <iostream>
using namespace Utils;
// Qt version file stuff: // Qt version file stuff:
const char PREFIX[] = "QtVersion."; const char PREFIX[] = "QtVersion.";
const char VERSION[] = "Version"; const char VERSION[] = "Version";
@@ -297,7 +299,7 @@ QVariantMap AddQtOperation::addQt(const QVariantMap &map,
const QString qt = QString::fromLatin1(PREFIX) + QString::number(versionCount); const QString qt = QString::fromLatin1(PREFIX) + QString::number(versionCount);
// Sanitize qmake path: // Sanitize qmake path:
QString saneQmake = QDir::cleanPath(QDir::fromNativeSeparators(qmake)); FilePath saneQmake = FilePath::fromUserInput(qmake);
// insert data: // insert data:
KeyValuePairList data; KeyValuePairList data;
@@ -305,7 +307,7 @@ QVariantMap AddQtOperation::addQt(const QVariantMap &map,
data << KeyValuePair(QStringList() << qt << QLatin1String(DISPLAYNAME), QVariant(displayName)); data << KeyValuePair(QStringList() << qt << QLatin1String(DISPLAYNAME), QVariant(displayName));
data << KeyValuePair(QStringList() << qt << QLatin1String(AUTODETECTED), QVariant(true)); data << KeyValuePair(QStringList() << qt << QLatin1String(AUTODETECTED), QVariant(true));
data << KeyValuePair(QStringList() << qt << QLatin1String(AUTODETECTION_SOURCE), QVariant(sdkId)); data << KeyValuePair(QStringList() << qt << QLatin1String(AUTODETECTION_SOURCE), QVariant(sdkId));
data << KeyValuePair(QStringList() << qt << QLatin1String(QMAKE), QVariant(saneQmake)); data << KeyValuePair(QStringList() << qt << QLatin1String(QMAKE), saneQmake.toVariant());
data << KeyValuePair(QStringList() << qt << QLatin1String(TYPE), QVariant(type)); data << KeyValuePair(QStringList() << qt << QLatin1String(TYPE), QVariant(type));
data << KeyValuePair(QStringList() << qt << ABIS, QVariant(abis)); data << KeyValuePair(QStringList() << qt << ABIS, QVariant(abis));

6
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -35,8 +35,6 @@
#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.";
@@ -106,7 +104,7 @@ bool AddToolChainOperation::setArguments(const QStringList &args)
if (current == "--path") { if (current == "--path") {
++i; // skip next; ++i; // skip next;
m_path = QDir::fromNativeSeparators(next); m_path = next;
continue; continue;
} }
@@ -278,7 +276,7 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, const QS
data << KeyValuePair({tc, LANGUAGE_KEY_V2}, QVariant(newLang)); data << KeyValuePair({tc, LANGUAGE_KEY_V2}, QVariant(newLang));
data << KeyValuePair({tc, DISPLAYNAME}, QVariant(displayName)); data << KeyValuePair({tc, DISPLAYNAME}, QVariant(displayName));
data << KeyValuePair({tc, AUTODETECTED}, QVariant(true)); data << KeyValuePair({tc, AUTODETECTED}, QVariant(true));
data << KeyValuePair({tc, PATH}, QVariant(path)); data << KeyValuePair({tc, PATH}, Utils::FilePath::fromUserInput(path).toVariant());
data << KeyValuePair({tc, TARGET_ABI}, QVariant(abi)); data << KeyValuePair({tc, TARGET_ABI}, QVariant(abi));
QVariantList abis; QVariantList abis;
QStringList abiStrings = supportedAbis.split(','); QStringList abiStrings = supportedAbis.split(',');