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

Merge integration refs/builds/qtci/dev/1617208505

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-31 18:42:29 +00:00
commit 8f6d8d7cd8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/socket/qlocalsocket.cpp
View File

@ -219,7 +219,7 @@ QT_BEGIN_NAMESPACE
Attempts to close the socket. If there is pending data waiting to be Attempts to close the socket. If there is pending data waiting to be
written, QLocalSocket will enter ClosingState and wait until all data written, QLocalSocket will enter ClosingState and wait until all data
has been written. Eventually, it will enter UnconnectedState and emit has been written. Eventually, it will enter UnconnectedState and emit
the disconnectedFromServer() signal. the disconnected() signal.
\sa connectToServer() \sa connectToServer()
*/ */

7
src/network/socket/qlocalsocket_win.cpp
View File

@ -260,13 +260,10 @@ void QLocalSocketPrivate::_q_pipeClosed()
emit q->disconnected(); emit q->disconnected();
pipeReader->stop(); pipeReader->stop();
delete pipeWriter;
pipeWriter = nullptr;
destroyPipeHandles(); destroyPipeHandles();
handle = INVALID_HANDLE_VALUE; handle = INVALID_HANDLE_VALUE;
if (pipeWriter) {
delete pipeWriter;
pipeWriter = 0;
}
} }
qint64 QLocalSocket::bytesAvailable() const qint64 QLocalSocket::bytesAvailable() const