From 37a10f4a2ba1805f90bdfbea5b805f2d4f2d9270 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 23 Nov 2021 10:26:36 +0100 Subject: [PATCH] SdkTool: Fix path handling and adjust expectation Amends 1a6e6825e6e253. Change-Id: I0e0c1bf46951a05d360032e01c15ff8adb31ac33 Reviewed-by: hjk Reviewed-by: Christian Kandeler --- src/tools/sdktool/addkitoperation.cpp | 6 ++++-- src/tools/sdktool/addqtoperation.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index d73dcc9c5db..d5de0562bfa 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -446,7 +446,7 @@ bool AddKitOperation::test() const // Profile 1: Make sure name is unique: map = addKit(map, tcMap, qtMap, devMap, QVariantMap(), "testId2", "Test Kit2", "/tmp/icon2.png", QString(), 1, - "/usr/bin/gdb-test2", "Desktop", "{dev-id}", "/sys/root\\\\", tcs, + "/usr/bin/gdb-test2", "Desktop", "{dev-id}", "/sys/root//", tcs, "{qt-id}", "unsupported/mkspec", QString(), QString(), QString(), QString(), QString(), QStringList(), env, KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))})); @@ -456,6 +456,7 @@ bool AddKitOperation::test() const || !map.contains(DEFAULT) || map.value(DEFAULT).toInt() != 0 || !map.contains("Profile.0") || !map.contains("Profile.1")) + return false; if (map.value("Profile.0") != profile0) return false; @@ -475,7 +476,7 @@ bool AddKitOperation::test() const || !data.contains(DEBUGGER) || data.value(DEBUGGER).type() != QVariant::Map || !data.contains(DEVICE_TYPE) || data.value(DEVICE_TYPE).toString() != "Desktop" || !data.contains(DEVICE_ID) || data.value(DEVICE_ID).toString() != "{dev-id}" - || !data.contains(SYSROOT) || data.value(SYSROOT).toString() != "/sys/root\\\\" + || !data.contains(SYSROOT) || data.value(SYSROOT).toString() != "/sys/root//" || !data.contains(TOOLCHAIN) || !data.contains(QT) || data.value(QT).toString() != "SDK.{qt-id}" || !data.contains(MKSPEC) || data.value(MKSPEC).toString() != "unsupported/mkspec" @@ -501,6 +502,7 @@ bool AddKitOperation::test() const || !map.contains("Profile.0") || !map.contains("Profile.1") || !map.contains("Profile.2")) + return false; if (map.value("Profile.0") != profile0) return false; diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index 7f256bf3279..7af41db1218 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -299,7 +299,7 @@ QVariantMap AddQtOperation::addQt(const QVariantMap &map, const QString qt = QString::fromLatin1(PREFIX) + QString::number(versionCount); // Sanitize qmake path: - FilePath saneQmake = FilePath::fromUserInput(qmake); + FilePath saneQmake = FilePath::fromUserInput(qmake).cleanPath(); // insert data: KeyValuePairList data;