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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/libs/utils/deviceshell.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/remotelinux/linuxdevice.cpp

Change-Id: Idc2edf428c98e9cbc891f1833b271ce2def9a835
This commit is contained in:
Eike Ziller
2022-09-21 10:59:59 +02:00
parent d696f3380c 5ebb467cc6
commit 3011548066
34 changed files with 1283 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,7 +479,7 @@ void DockerDevicePrivate::startContainer()
return;
qCWarning(dockerDeviceLog) << "Container shell encountered error:" << resultData.m_error;
m_shell.reset();
m_shell.release()->deleteLater();
DockerApi::recheckDockerDaemon();
MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. "
@@ -501,7 +501,7 @@ void DockerDevicePrivate::updateContainerAccess()
if (m_shell)
return;
startContainer();
startContainer();
}
void DockerDevice::setMounts(const QStringList &mounts) const