diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 23:13:20 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 15:37:35 +0000 |
| commit | 405bc8e140f934c1226b91544daf170d0341d282 (patch) | |
| tree | 636255beda07e556a145385570057cbc9e34fed0 | |
| parent | f14626e48c704f82fcb510ad6e6e26722c2dad15 (diff) | |
| parent | b87b72cfff754136721d9ab3ac878e1182184f83 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
dependencies.yaml
Change-Id: Ie524ba7a95f593032e5201afcab752d25187953c
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/handshakerequest/BLACKLIST | 5 |
5 files changed, 6 insertions, 9 deletions
diff --git a/.cmake.conf b/.cmake.conf index 07d90b8..e62fae5 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 3f1a177..ae8c1a2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.7 +MODULE_VERSION = 6.2.8 diff --git a/dependencies.yaml b/dependencies.yaml index b12c2dd..734f5d1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true ../tqtc-qtdeclarative: - ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545 + ref: 302ab20d46280e11042f3896460c55d8b8146e41 required: false diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 6bc700b..37d1f0b 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1119,6 +1119,8 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) m_handshakeState = AllDoneState; setErrorString(errorDescription); Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + if (m_pSocket->state() != QAbstractSocket::UnconnectedState) + m_pSocket->disconnectFromHost(); } } diff --git a/tests/auto/websockets/handshakerequest/BLACKLIST b/tests/auto/websockets/handshakerequest/BLACKLIST deleted file mode 100644 index 191f4e8..0000000 --- a/tests/auto/websockets/handshakerequest/BLACKLIST +++ /dev/null @@ -1,5 +0,0 @@ -# QTBUG-84315 -[tst_qtbug_57357:invalid-2] -* -[tst_qtbug_57357:invalid-4] -* |