forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/8.0'
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:
@@ -802,7 +802,9 @@ public:
|
||||
cmd.addArg("/bin/sh");
|
||||
|
||||
m_shell.reset(new LinuxDeviceShell(cmd, FilePath::fromString(QString("ssh://%1/").arg(parameters.userAtHost()))));
|
||||
connect(m_shell.get(), &DeviceShell::done, this, [this] { m_shell.reset(); });
|
||||
connect(m_shell.get(), &DeviceShell::done, this, [this] {
|
||||
m_shell.release()->deleteLater();
|
||||
});
|
||||
return m_shell->start();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user