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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
Eike Ziller
2020-11-19 15:38:13 +01:00
parent b269066435 9b6944086b
commit 5ca70bdcb3
271 changed files with 2816 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/ssh/sshconnectionmanager.cpp
View File

@@ -107,11 +107,11 @@ public:
|| connection->connectionParameters() != sshParams)
continue;
if (connection->thread() != QThread::currentThread()) {
QMetaObject::invokeMethod(this, "switchToCallerThread",
Qt::BlockingQueuedConnection,
Q_ARG(SshConnection *, connection),
Q_ARG(QObject *, QThread::currentThread()));
auto currentThread = QThread::currentThread();
if (connection->thread() != currentThread) {
QMetaObject::invokeMethod(this, [this, connection, currentThread] {
switchToCallerThread(connection, currentThread);
}, Qt::BlockingQueuedConnection);
}
m_unacquiredConnections.removeOne(c);