summaryrefslogtreecommitdiff
path: root/src/plugins/docker/dockerdevice.cpp
diff options
context:
space:
mode:
authorMarcus Tillmanns <marcus.tillmanns@qt.io>2022-10-14 10:21:49 +0200
committerMarcus Tillmanns <marcus.tillmanns@qt.io>2022-10-14 09:52:22 +0000
commit359ad56e176ef59d7f72a51b24ab80df3f178497 (patch)
treea71cb68b49eaeda2587208d62da8270397d3ec56 /src/plugins/docker/dockerdevice.cpp
parent9aa1d56f56e00f9ea658c9bd12db005375ad5805 (diff)
downloadqt-creator-359ad56e176ef59d7f72a51b24ab80df3f178497.tar.gz
Docker: combine escapeMountPath function
Change-Id: Ib04f8245d2da096a9d9fdbdf9b5243ca80d52bfa Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/docker/dockerdevice.cpp')
-rw-r--r--src/plugins/docker/dockerdevice.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 1fd44e721a..96bdc53a64 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -520,18 +520,21 @@ QString escapeMountPathWin(const FilePath &fp)
return result;
}
+QString escapeMountPath(const FilePath &fp)
+{
+ if (HostOsInfo::isWindowsHost())
+ return escapeMountPathWin(fp);
+
+ return escapeMountPathUnix(fp);
+}
+
QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
{
QString escapedPath;
QString escapedContainerPath;
- if (HostOsInfo::isWindowsHost()) {
- escapedPath = escapeMountPathWin(mi.path);
- escapedContainerPath = escapeMountPathWin(mi.containerPath);
- } else {
- escapedPath = escapeMountPathUnix(mi.path);
- escapedContainerPath = escapeMountPathUnix(mi.containerPath);
- }
+ escapedPath = escapeMountPath(mi.path);
+ escapedContainerPath = escapeMountPath(mi.containerPath);
const QString mountArg = QString(R"(type=bind,"source=%1","destination=%2")")
.arg(escapedPath)