Merge remote-tracking branch 'origin/7.0'

Change-Id: I809383e6c060701a2751197a8bf16add92bfaf0d
2022-02-28 09:21:18 +01:00
parent 1cb4017e71 8828e6c22d
commit d295d16ab5
43 changed files with 579 additions and 272 deletions
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -37,10 +37,8 @@ namespace Internal {
 class DockerDeviceData
 {
 public:
-    // Used for "docker run" and for host parts of FilePaths
-    QString dockerId() const;
-    // Used as autodetection source string
-    QString autodetectId() const { return "docker:" + dockerId(); }
+    // Used for "docker run"
+    QString repoAndTag() const;

    QString imageId;
    QString repo;