diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-04 12:42:24 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-04 13:02:42 +0200 |
commit | 1be5082af805e71ce2ca6ed04ff5de0f069da770 (patch) | |
tree | 55d89790592f7391c7587e1432ae462cd58e9c5a /src/libs/installer/remoteserverconnection.cpp | |
parent | 8482b4da46505c725d93a1e0478ded99bcbde4d2 (diff) | |
parent | 09b8632d301ffa865bf717c5497b6b7a17e86b53 (diff) |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
src/libs/installer/packagemanagercore.cpp
Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8
Diffstat (limited to 'src/libs/installer/remoteserverconnection.cpp')
-rw-r--r-- | src/libs/installer/remoteserverconnection.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/installer/remoteserverconnection.cpp b/src/libs/installer/remoteserverconnection.cpp index cdaf070fd..78dd58643 100644 --- a/src/libs/installer/remoteserverconnection.cpp +++ b/src/libs/installer/remoteserverconnection.cpp @@ -165,6 +165,7 @@ void RemoteServerConnection::run() if (m_signalReceiver) { QMutexLocker _(&m_signalReceiver->m_lock); sendData(&socket, m_signalReceiver->m_receivedSignals); + socket.flush(); m_signalReceiver->m_receivedSignals.clear(); } continue; @@ -179,6 +180,7 @@ void RemoteServerConnection::run() } else { qDebug() << "Unknown command:" << command; } + socket.flush(); } else { // authorization failed, connection not wanted socket.close(); |