diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-29 09:34:06 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-02 13:33:08 +0000 |
| commit | 4e1d375dc8f8849582aca147b63432bc9bb3deb4 (patch) | |
| tree | 6333fcd9790ee11ff77dd1d3886a8083df77ac01 /src/libs/installer/remoteserver_p.h | |
| parent | 92b238a41ef5d781ad4db722b6f69ec920864f69 (diff) | |
Make sure RemoteServerConnection is properly shut down
QThreadServerConnection is automatically deleted via deleteLater on exit.
Anyhow, TcpServer::shutdown() also tries to quit() all child threads by
going through the list of children. Making the QThread a child of TcpServer
activates this behavior again.
Change-Id: If1639ae2c9cd74a83b8ff1814aa2131d9016de14
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/remoteserver_p.h')
| -rw-r--r-- | src/libs/installer/remoteserver_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/remoteserver_p.h b/src/libs/installer/remoteserver_p.h index e210feb1e..431641188 100644 --- a/src/libs/installer/remoteserver_p.h +++ b/src/libs/installer/remoteserver_p.h @@ -84,7 +84,7 @@ private: if (m_shutdown) return; - QThread *const thread = new RemoteServerConnection(socketDescriptor, m_key); + QThread *const thread = new RemoteServerConnection(socketDescriptor, m_key, this); connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); connect(thread, SIGNAL(shutdownRequested()), this, SLOT(shutdown())); thread->start(); |