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

Docker: Start making it work on macOS

Browse Source 
Change-Id: I450c7b19de1694da456e16e95b698c1476623a97
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-12-09 10:17:34 +01:00
parent 6b3191c11e
commit 420b5bf541
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -933,13 +933,13 @@ void DockerDevicePrivate::tryCreateLocalFileAccess()
.arg(m_container, m_mergedDir) .arg(m_container, m_mergedDir)
+ '\n' + tr("Output: \"%1\"").arg(out) + '\n' + tr("Output: \"%1\"").arg(out)
+ '\n' + tr("Error: \"%1\"").arg(proc.stdErr())); + '\n' + tr("Error: \"%1\"").arg(proc.stdErr()));
if (HostOsInfo::isWindowsHost()) { if (!HostOsInfo::isLinuxHost()) {
// Disabling merged layer access. This is not supported and anything // Disabling merged layer access. This is not supported and anything
// related to accessing merged layers on Windows fails due to the need // related to accessing merged layers on Windows or macOS fails due
// of using wsl or a named pipe. // to the need of using wsl or a named pipe.
// TODO investigate how to make it possible nevertheless. // TODO investigate how to make it possible nevertheless.
m_mergedDir.clear(); m_mergedDir.clear();
MessageManager::writeSilently(tr("This is expected on Windows.")); MessageManager::writeSilently(tr("This is expected on Windows and macOS."));
return; return;
} }
} }