Update dependencies on '6.10' in qt/qtmqtt

Change-Id: I5f93dde143e1e57b43aee063a4eb535adc67234c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-10-25 16:16:26 +00:00 · 2025-11-20 07:33:03 +00:00 · 2025-11-18 11:27:29 +00:00 · 2025-11-18 11:27:28 +00:00 · 2025-11-07 12:14:32 +00:00 · 2025-11-06 10:52:26 +00:00
6 changed files with 22 additions and 7 deletions
--- a/.cmake.conf
+++ b/.cmake.conf
@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.10.0")
+set(QT_REPO_MODULE_VERSION "6.10.2")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
 list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
--- a/dependencies.yaml
+++ b/dependencies.yaml
@ -1,10 +1,10 @@
 dependencies:
  ../qtbase:
-    ref: 2bf916b8e1b1989d95701a82dedf238ac4117515
+    ref: 35cdf66b1df78880f0a4d9eb0e695e0c79b02dd7
    required: true
  ../qtdeclarative:
-    ref: 4c77c50924afcb92aed176f7d9471e0e29818c3a
+    ref: 41700df21b1ca93a8e51332e4826a762e5d19d1e
    required: true
  ../qtwebsockets:
-    ref: c060bfbfc2495d8873ed0849863d36fd51230be4
+    ref: 162cd02e1af3a5e5ad49a0681c5e957252f26ef2
    required: false
--- a/src/mqtt/qmqttclient.cpp
+++ b/src/mqtt/qmqttclient.cpp
@ -1,6 +1,6 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-// Qt-Security score:significant reason:default
+// Qt-Security score:critical reason:network-protocol

 #include "qmqttclient.h"
 #include "qmqttclient_p.h"
--- a/src/mqtt/qmqtttopicname.cpp
+++ b/src/mqtt/qmqtttopicname.cpp
@ -1,6 +1,6 @@
 // Copyright (C) 2017 Lorenz Haas
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-// Qt-Security score:significant reason:default
+// Qt-Security score:critical reason:data-parser

 #include "qmqtttopicname.h"

--- a/src/mqtt/transportLayers/mqtt_websocket_io_base_p.h
+++ b/src/mqtt/transportLayers/mqtt_websocket_io_base_p.h
@ -56,6 +56,13 @@ public:
        return static_cast<qint64>(m_buffer.size()) + QIODevice::bytesAvailable();
    }

+    bool waitForBytesWritten(int msecs) override
+    {
+        Q_UNUSED(msecs);
+        m_socket->flush();
+        return true;
+    }
+
    bool isConnected() const
    {
        return (m_socket->state() == QAbstractSocket::ConnectedState);
--- a/tests/common/broker_connection.h
+++ b/tests/common/broker_connection.h
@ -314,7 +314,14 @@ Q_DECLARE_METATYPE(QMqttClient::ProtocolVersion)
  VersionClientBase(MQTTVERSION, CLIENTNAME, qgetenv("MQTT_TEST_BROKER_TYPE"))
 #endif

-
+#ifdef MQTT_TEST_PROTOCOL
+#define DefaultVersionTestData(FUNCTION) \
+void FUNCTION() \
+{ \
+    QTest::addColumn<QMqttClient::ProtocolVersion>("mqttVersion"); \
+    QTest::newRow("V0") << QMqttClient::ProtocolVersion(0); \
+}
+#else
 #define DefaultVersionTestData(FUNCTION) \
 void FUNCTION() \
 { \
@ -326,3 +333,4 @@ void FUNCTION() \
        QTest::newRow("V5.0.0") << QMqttClient::MQTT_5_0; \
    } \
 }
+#endif
Author	SHA1	Message	Date
Qt Submodule Update Bot	4bffb33d47	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I5f93dde143e1e57b43aee063a4eb535adc67234c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-20 07:33:03 +00:00
Qt Submodule Update Bot	a59382ba0c	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I3f710288db32fe12bdcc887466ae4189179bdff6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-18 11:27:29 +00:00
Jani Heikkinen	da5ca8049c	Bump version to 6.10.2 Change-Id: I961e5a0e738b444080d55c912d99aab10de8869e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-11-18 11:27:28 +00:00
Qt Submodule Update Bot	3532b0559e	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I845fed7abcf3c9e4f27a98c7ae707450b5e65b8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-07 12:14:32 +00:00
Qt Submodule Update Bot	80aa33ca26	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I678ccf73e445816aa43201e08dd50765015aeefd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-06 10:52:26 +00:00
Qt Submodule Update Bot	101660eac0	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I05451ccc6e99282cb1dcb8b7aa032b8579875d83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-04 07:42:19 +00:00
Qt Submodule Update Bot	dc3b7aad90	Update dependencies on '6.10' in qt/qtmqtt Change-Id: Ib998663d99143cf8752a0e97f5d054d7c5876e5f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-30 08:24:48 +00:00
Qt Submodule Update Bot	a82cefaec6	Update dependencies on '6.10' in qt/qtmqtt Change-Id: Ia32b0bce0b1618b153eee222874895a43c4787e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-29 07:25:00 +00:00
Qt Submodule Update Bot	a806d93694	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I022113b18e70c546f0d1a9bf964db7075d16eb44 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-27 12:12:30 +00:00
Qt Submodule Update Bot	c8111992f5	Update dependencies on '6.10' in qt/qtmqtt Change-Id: Ib06e1123fb8edbeac70e458e44a73fb058446842 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-24 09:35:11 +00:00
Qt Submodule Update Bot	3a4d1356a0	Update dependencies on '6.10' in qt/qtmqtt Change-Id: Id734074a50657628dbf2d487d6589ea2524e52ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-22 13:27:43 +00:00
Ivan Solovev	b699ef80e8	Mark more files as security-critical The qmqttclient.cpp file contains parts of the MQTT protocol implementation, and hence marked as security-critical. The qmqtttopicname.cpp file contains the code that validates the topic name and also parses the levels -> it is a data-parser, so should be security-critical as well. Amends `18548033e1`, which incorrectly marked these files as significant. Not picking to 6.9 anymore, because that branch is already closed. Task-number: QTBUG-135764 Pick-to: 6.8 Change-Id: I0e8b72fb1d24b7bbf6ac5edab63e137f9d36dd30 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> (cherry picked from commit `b5c1e3aeb6`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-10-15 09:03:41 +00:00
Qt Submodule Update Bot	85eeced3a7	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I05e22f28fd81dbb80a3b5994c7a9db1e1c0c2bda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-10 15:57:15 +00:00
Qt Submodule Update Bot	02bfba1676	Update dependencies on '6.10' in qt/qtmqtt Change-Id: If634e78e82be3b680df1f8d3b7b0dd20a814bf65 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-08 19:19:56 +00:00
Qt Submodule Update Bot	1caf5d8edb	Update dependencies on '6.10' in qt/qtmqtt Change-Id: I457fdb3a38c489e727d37ad979a6e1d0ff79dfa6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-01 08:45:14 +00:00
Qt Submodule Update Bot	ad2f59c949	Update dependencies on '6.10' in qt/qtmqtt Change-Id: Id29f7bb11068416e70ba25dd63b2360c3b8654cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-29 18:12:20 +00:00
Jani Heikkinen	561553df97	Bump version to 6.10.1 Change-Id: I8e660eae35ee48c3b6dc17fe61b667b90a354bf7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-09-29 19:12:19 +01:00
Even Oscar Andersen	1d3929d7c9	Implement waitForBytesWritten for the websockets case Not implementing this function causes a lot if Invalid Socket Specified in the tests. Also fixed a problem with broker_connection.h where DefaultVersionTestData did not evaluate to version(0) if MQTT_TEST_PROTOCOL was defined. Fixes: QTBUG-137305 Change-Id: I4b825196548a3f5bf07c3bb4203a0b46033004ba Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> (cherry picked from commit `635ae612f1`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-09-10 10:39:04 +00:00