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

Docker: Move rootPath into Settings

Browse Source 
Change-Id: I11aa1d928281b13ccb136b907c9eb8f98582fd28
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-10-04 10:00:28 +02:00
parent c999f4f880
commit c50f9a9273
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/docker/dockerdevice.cpp
View File

@@ -261,6 +261,11 @@ QString DockerDeviceSettings::repoAndTagEncoded() const
return repoAndTag().replace(':', '.'); return repoAndTag().replace(':', '.');
} }
FilePath DockerDeviceSettings::rootPath() const
{
return FilePath::fromParts(Constants::DOCKER_DEVICE_SCHEME, repoAndTagEncoded(), u"/");
}
class DockerDevicePrivate : public QObject class DockerDevicePrivate : public QObject
{ {
public: public:
@@ -959,7 +964,7 @@ FilePath DockerDevice::filePath(const QString &pathOnDevice) const
FilePath DockerDevice::rootPath() 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 bool DockerDevice::handlesFile(const FilePath &filePath) const

1
src/plugins/docker/dockerdevice.h
View File

@@ -23,6 +23,7 @@ public:
QString repoAndTag() const; QString repoAndTag() const;
QString repoAndTagEncoded() const; QString repoAndTagEncoded() const;
Utils::FilePath rootPath() const;
Utils::StringAspect imageId{this}; Utils::StringAspect imageId{this};
Utils::StringAspect repo{this}; Utils::StringAspect repo{this};