diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:38 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:38 +0300 |
| commit | b8bd84dd12eeaaf0bd2dbed1e7ba651efbc93cc4 (patch) | |
| tree | 234a20976ce331ee5587c1b82eabc508574e5ab8 | |
| parent | f8f4c6c57c8463aec293a345b7a0671cbf24a6cc (diff) | |
| parent | 40af0582a02548d6a5f17e331c9742cd24aa78c7 (diff) | |
Merge tag 'v6.5.7-lts-lgpl' into 6.56.5
Qt 6.5.7-lts-lgpl release
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp | 1 |
5 files changed, 8 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index 1aa29ce..98c2813 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.6") +set(QT_REPO_MODULE_VERSION "6.5.7") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff --git a/dependencies.yaml b/dependencies.yaml index 85aae14..dbb9bf0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: false diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index 51a84cf..4459b7c 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -124,6 +124,8 @@ QQmlWebSocket::QQmlWebSocket(QWebSocket *socket, QObject *parent) : QQmlWebSocket::~QQmlWebSocket() { + if (m_webSocket) + m_webSocket->disconnect(); } qint64 QQmlWebSocket::sendTextMessage(const QString &message) diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 92df309..05323be 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -446,6 +446,8 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, m_isClosingHandshakeSent = false; setRequest(request, options); + if (url.path().isEmpty()) + url.setPath(QStringLiteral("/")); QString resourceName = url.path(QUrl::FullyEncoded); // Check for encoded \r\n if (resourceName.contains(QStringLiteral("%0D%0A"))) { diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp index 5fa9c8d..16ed83f 100644 --- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp +++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp @@ -682,6 +682,7 @@ void tst_QWebSocket::tst_openRequest() QUrl url = QUrl(QStringLiteral("ws://") + echoServer.hostAddress().toString() + QLatin1Char(':') + QString::number(echoServer.port())); + url.setPath(QLatin1String("/")); QUrlQuery query; query.addQueryItem("queryitem", "with encoded characters"); url.setQuery(query); |