diff options
-rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 1 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 1 | ||||
-rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index a0f511b208..cc9df3bd17 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -68,7 +68,6 @@ void QLocalSocketPrivate::setSocket(QLocalUnixSocket* socket) Q_Q(QLocalSocket); // QIODevice signals - q->connect(tcpSocket, SIGNAL(aboutToClose()), q, SIGNAL(aboutToClose())); q->connect(tcpSocket, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64))); q->connect(tcpSocket, SIGNAL(readyRead()), q, SIGNAL(readyRead())); diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 2156644255..d10ab36821 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -97,7 +97,6 @@ void QLocalSocketPrivate::init() { Q_Q(QLocalSocket); // QIODevice signals - q->connect(&unixSocket, SIGNAL(aboutToClose()), q, SIGNAL(aboutToClose())); q->connect(&unixSocket, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64))); q->connect(&unixSocket, SIGNAL(readyRead()), q, SIGNAL(readyRead())); diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 5cf02d3581..97214a5914 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -489,6 +489,7 @@ void tst_QLocalSocket::connectWithOpen() QVERIFY(server.listen("tst_qlocalsocket")); LocalSocket socket; + QSignalSpy spyAboutToClose(&socket, SIGNAL(aboutToClose())); socket.setServerName("tst_qlocalsocket"); QVERIFY(socket.open()); @@ -502,6 +503,8 @@ void tst_QLocalSocket::connectWithOpen() socket.close(); server.close(); + + QCOMPARE(spyAboutToClose.count(), 1); } void tst_QLocalSocket::listenAndConnectAbstractNamespaceTrailingZeros_data() |