From c50f9a927343bd5645330e5641e7ded9308f6b57 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Wed, 4 Oct 2023 10:00:28 +0200
Subject: [PATCH] Docker: Move rootPath into Settings

Change-Id: I11aa1d928281b13ccb136b907c9eb8f98582fd28
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/docker/dockerdevice.cpp | 7 ++++++-
 src/plugins/docker/dockerdevice.h   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index d30dbcc107c..b8c3fe47d89 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -261,6 +261,11 @@ QString DockerDeviceSettings::repoAndTagEncoded() const
     return repoAndTag().replace(':', '.');
 }
 
+FilePath DockerDeviceSettings::rootPath() const
+{
+    return FilePath::fromParts(Constants::DOCKER_DEVICE_SCHEME, repoAndTagEncoded(), u"/");
+}
+
 class DockerDevicePrivate : public QObject
 {
 public:
@@ -959,7 +964,7 @@ FilePath DockerDevice::filePath(const QString &pathOnDevice) const
 
 FilePath DockerDevice::rootPath() const
 {
-    return FilePath::fromParts(Constants::DOCKER_DEVICE_SCHEME, d->repoAndTagEncoded(), u"/");
+    return d->deviceSettings->rootPath();
 }
 
 bool DockerDevice::handlesFile(const FilePath &filePath) const
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index 7c170182160..477de04168a 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -23,6 +23,7 @@ public:
 
     QString repoAndTag() const;
     QString repoAndTagEncoded() const;
+    Utils::FilePath rootPath() const;
 
     Utils::StringAspect imageId{this};
     Utils::StringAspect repo{this};