1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLocalSocket: do not emit aboutToClose() twice

Browse Source 
This signal is emitted by the QIODevice itself, so we don't have to
forward it from the internal socket.

Change-Id: I85745f36d7a27d92f339a9184de3b6e5d46f6f34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
(cherry picked from commit 21f3ff65b8df777b5726a68b09bbee39f1a893ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alex Trotsenko 2021-07-31 15:20:54 +03:00 committed by Qt Cherry-pick Bot
parent ccb0792a24
commit d3b5c3c964
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/socket/qlocalsocket_tcp.cpp
View File

@ -68,7 +68,6 @@ void QLocalSocketPrivate::setSocket(QLocalUnixSocket* socket)
Q_Q(QLocalSocket); Q_Q(QLocalSocket);
// QIODevice signals // QIODevice signals
q->connect(tcpSocket, SIGNAL(aboutToClose()), q, SIGNAL(aboutToClose()));
q->connect(tcpSocket, SIGNAL(bytesWritten(qint64)), q->connect(tcpSocket, SIGNAL(bytesWritten(qint64)),
q, SIGNAL(bytesWritten(qint64))); q, SIGNAL(bytesWritten(qint64)));
q->connect(tcpSocket, SIGNAL(readyRead()), q, SIGNAL(readyRead())); q->connect(tcpSocket, SIGNAL(readyRead()), q, SIGNAL(readyRead()));

1
src/network/socket/qlocalsocket_unix.cpp
View File

@ -72,7 +72,6 @@ void QLocalSocketPrivate::init()
{ {
Q_Q(QLocalSocket); Q_Q(QLocalSocket);
// QIODevice signals // QIODevice signals
q->connect(&unixSocket, SIGNAL(aboutToClose()), q, SIGNAL(aboutToClose()));
q->connect(&unixSocket, SIGNAL(bytesWritten(qint64)), q->connect(&unixSocket, SIGNAL(bytesWritten(qint64)),
q, SIGNAL(bytesWritten(qint64))); q, SIGNAL(bytesWritten(qint64)));
q->connect(&unixSocket, SIGNAL(readyRead()), q, SIGNAL(readyRead())); q->connect(&unixSocket, SIGNAL(readyRead()), q, SIGNAL(readyRead()));

3
tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -468,6 +468,7 @@ void tst_QLocalSocket::connectWithOpen()
QVERIFY(server.listen("tst_qlocalsocket")); QVERIFY(server.listen("tst_qlocalsocket"));
LocalSocket socket; LocalSocket socket;
QSignalSpy spyAboutToClose(&socket, SIGNAL(aboutToClose()));
socket.setServerName("tst_qlocalsocket"); socket.setServerName("tst_qlocalsocket");
QVERIFY(socket.open()); QVERIFY(socket.open());
@ -481,6 +482,8 @@ void tst_QLocalSocket::connectWithOpen()
socket.close(); socket.close();
server.close(); server.close();
QCOMPARE(spyAboutToClose.count(), 1);
} }
void tst_QLocalSocket::connectWithOldOpen() void tst_QLocalSocket::connectWithOldOpen()