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

Docker: Remove traces of direct file access

Browse Source 
Change-Id: Id0c11a584a5b75626bb04023893d76fbe2216ade
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-02-28 09:36:20 +01:00
parent 9cf7350f1f
commit fc3b9b5ab3
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -908,7 +908,6 @@ const char DockerDeviceDataRepoKey[] = "DockerDeviceDataRepo";
const char DockerDeviceDataTagKey[] = "DockerDeviceDataTag"; const char DockerDeviceDataTagKey[] = "DockerDeviceDataTag";
const char DockerDeviceDataSizeKey[] = "DockerDeviceDataSize"; const char DockerDeviceDataSizeKey[] = "DockerDeviceDataSize";
const char DockerDeviceUseOutsideUser[] = "DockerDeviceUseUidGid"; const char DockerDeviceUseOutsideUser[] = "DockerDeviceUseUidGid";
const char DockerDeviceUseFilePathMapping[] = "DockerDeviceFilePathMapping";
const char DockerDeviceMappedPaths[] = "DockerDeviceMappedPaths"; const char DockerDeviceMappedPaths[] = "DockerDeviceMappedPaths";
void DockerDevice::fromMap(const QVariantMap &map) void DockerDevice::fromMap(const QVariantMap &map)
@@ -920,8 +919,6 @@ void DockerDevice::fromMap(const QVariantMap &map)
d->m_data.size = map.value(DockerDeviceDataSizeKey).toString(); d->m_data.size = map.value(DockerDeviceDataSizeKey).toString();
d->m_data.useLocalUidGid = map.value(DockerDeviceUseOutsideUser, d->m_data.useLocalUidGid = map.value(DockerDeviceUseOutsideUser,
HostOsInfo::isLinuxHost()).toBool(); HostOsInfo::isLinuxHost()).toBool();
d->m_data.useFilePathMapping = map.value(DockerDeviceUseFilePathMapping,
HostOsInfo::isLinuxHost()).toBool();
d->m_data.mounts = map.value(DockerDeviceMappedPaths).toStringList(); d->m_data.mounts = map.value(DockerDeviceMappedPaths).toStringList();
} }
@@ -933,7 +930,6 @@ QVariantMap DockerDevice::toMap() const
map.insert(DockerDeviceDataImageIdKey, d->m_data.imageId); map.insert(DockerDeviceDataImageIdKey, d->m_data.imageId);
map.insert(DockerDeviceDataSizeKey, d->m_data.size); map.insert(DockerDeviceDataSizeKey, d->m_data.size);
map.insert(DockerDeviceUseOutsideUser, d->m_data.useLocalUidGid); map.insert(DockerDeviceUseOutsideUser, d->m_data.useLocalUidGid);
map.insert(DockerDeviceUseFilePathMapping, d->m_data.useFilePathMapping);
map.insert(DockerDeviceMappedPaths, d->m_data.mounts); map.insert(DockerDeviceMappedPaths, d->m_data.mounts);
return map; return map;
} }

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

@@ -45,7 +45,6 @@ public:
QString tag; QString tag;
QString size; QString size;
bool useLocalUidGid = true; bool useLocalUidGid = true;
bool useFilePathMapping = false;
QStringList mounts; QStringList mounts;
}; };