diff options
| author | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-08-22 09:48:25 +0200 |
|---|---|---|
| committer | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-08-22 07:53:10 +0000 |
| commit | b96802b3ee8e7455f1243aae1315baaa3bbe0928 (patch) | |
| tree | d958c7c913938cae858afcbf157fe2f2979423a5 | |
| parent | 64b852e18648a9f7501a1c121da404a6cea0858b (diff) | |
SdkTool: Fix sysroot for docker devices
Using QDir::cleanPath on devices paths
destroys the path.
Also adds workaround for already registered toolkits.
Fixes: QTCREATORBUG-29523
Change-Id: Ibb331f3e4e3ec2021e517e341757499a7316b503
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/kitinformation.cpp | 2 | ||||
| -rw-r--r-- | src/tools/sdktool/addkitoperation.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index e28264d72b2..950cd9bb67f 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -152,7 +152,7 @@ FilePath SysRootKitAspect::sysRoot(const Kit *k) return FilePath(); if (!k->value(SysRootKitAspect::id()).toString().isEmpty()) - return FilePath::fromString(k->value(SysRootKitAspect::id()).toString()); + return FilePath::fromSettings(k->value(SysRootKitAspect::id())); for (ToolChain *tc : ToolChainKitAspect::toolChains(k)) { if (!tc->sysRoot().isEmpty()) diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 4f0911d011a..037cf3c5e5c 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -686,7 +686,7 @@ QVariantMap AddKitData::addKit(const QVariantMap &map, if (!m_buildDevice.isNull()) data << KeyValuePair({kit, DATA, BUILDDEVICE_ID}, QVariant(m_buildDevice)); if (!m_sysRoot.isNull()) - data << KeyValuePair({kit, DATA, SYSROOT}, QVariant(QDir::cleanPath(m_sysRoot))); + data << KeyValuePair({kit, DATA, SYSROOT}, QVariant(cleanPath(m_sysRoot))); for (auto i = m_tcs.constBegin(); i != m_tcs.constEnd(); ++i) data << KeyValuePair({kit, DATA, TOOLCHAIN, i.key()}, QVariant(i.value())); if (!qtId.isNull()) |