Merge tag 'v6.8.5-lts' into tqtc/lts-6.8-opensource

Qt 6.8.5-lts release Conflicts solved: * note: the following Qt-Security score-related changes caused conflicts: 7f69071596 97ac4c3a42 5a4b92eb38 dependencies.yaml src/mqtt/qmqttauthenticationproperties.cpp src/mqtt/qmqttauthenticationproperties.h src/mqtt/qmqttclient.cpp src/mqtt/qmqttclient.h src/mqtt/qmqttclient_p.h src/mqtt/qmqttconnection.cpp src/mqtt/qmqttconnection_p.h src/mqtt/qmqttconnectionproperties.cpp src/mqtt/qmqttconnectionproperties.h src/mqtt/qmqttconnectionproperties_p.h src/mqtt/qmqttcontrolpacket.cpp src/mqtt/qmqttcontrolpacket_p.h src/mqtt/qmqttglobal.h src/mqtt/qmqttmessage.cpp src/mqtt/qmqttmessage.h src/mqtt/qmqttmessage_p.h src/mqtt/qmqttpublishproperties.cpp src/mqtt/qmqttpublishproperties.h src/mqtt/qmqttpublishproperties_p.h src/mqtt/qmqttsubscription.cpp src/mqtt/qmqttsubscription.h src/mqtt/qmqttsubscription_p.h src/mqtt/qmqttsubscriptionproperties.cpp src/mqtt/qmqttsubscriptionproperties.h src/mqtt/qmqtttopicfilter.cpp src/mqtt/qmqtttopicfilter.h src/mqtt/qmqtttopicname.cpp src/mqtt/qmqtttopicname.h src/mqtt/qmqtttype.cpp src/mqtt/qmqtttype.h Change-Id: I9fd0cefcfe911aa60bbc68c796d0049f86ca344c
2026-10-25 16:16:26 +00:00 · 2026-10-08 22:39:11 +03:00 · 2026-10-08 22:39:11 +03:00 · fa15da7b5f
commit fa15da7b5f
parent 46e0d73c08 6b9a9c69e9
32 changed files with 33 additions and 3 deletions
--- a/.cmake.conf
+++ b/.cmake.conf
@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.8.4")
+set(QT_REPO_MODULE_VERSION "6.8.5")
 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,7 +1,7 @@
 dependencies:
  ../tqtc-qtbase:
-    ref: ed77a3ca9ef1bf5e33b6f32ea41110734fb14e88
+    ref: cb8d7269e88a5b82fd4614de5893f088bdbee9e6
    required: true
  ../tqtc-qtdeclarative:
-    ref: 35ba89a42a74ff6668a64a1361fe7208fee554af
+    ref: 81e6f7a3dd6204c13e2e6776adeada7f07a58122
    required: true
--- a/src/mqtt/qmqttauthenticationproperties.cpp
+++ b/src/mqtt/qmqttauthenticationproperties.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #include "qmqttauthenticationproperties.h"

--- a/src/mqtt/qmqttauthenticationproperties.h
+++ b/src/mqtt/qmqttauthenticationproperties.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTAUTHENTICATIONPROPERTIES_H
 #define QMQTTAUTHENTICATIONPROPERTIES_H
--- a/src/mqtt/qmqttclient.cpp
+++ b/src/mqtt/qmqttclient.cpp
@ -1,5 +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

 #include "qmqttclient.h"
 #include "qmqttclient_p.h"
--- a/src/mqtt/qmqttclient.h
+++ b/src/mqtt/qmqttclient.h
@ -1,5 +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

 #ifndef QTMQTTCLIENT_H
 #define QTMQTTCLIENT_H
--- a/src/mqtt/qmqttclient_p.h
+++ b/src/mqtt/qmqttclient_p.h
@ -1,5 +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

 #ifndef QMQTTCLIENT_P_H
 #define QMQTTCLIENT_P_H
--- a/src/mqtt/qmqttconnection.cpp
+++ b/src/mqtt/qmqttconnection.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:network-protocol

 #include "qmqttconnection_p.h"
 #include "qmqttconnectionproperties_p.h"
--- a/src/mqtt/qmqttconnection_p.h
+++ b/src/mqtt/qmqttconnection_p.h
@ -1,5 +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

 #ifndef QMQTTCONNECTION_P_H
 #define QMQTTCONNECTION_P_H
--- a/src/mqtt/qmqttconnectionproperties.cpp
+++ b/src/mqtt/qmqttconnectionproperties.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #include "qmqttconnectionproperties.h"

--- a/src/mqtt/qmqttconnectionproperties.h
+++ b/src/mqtt/qmqttconnectionproperties.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTCONNECTIONPROPERTIES_H
 #define QMQTTCONNECTIONPROPERTIES_H
--- a/src/mqtt/qmqttconnectionproperties_p.h
+++ b/src/mqtt/qmqttconnectionproperties_p.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTCONNECTIONPROPERTIES_P_H
 #define QMQTTCONNECTIONPROPERTIES_P_H
--- a/src/mqtt/qmqttcontrolpacket.cpp
+++ b/src/mqtt/qmqttcontrolpacket.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:network-protocol

 #include "qmqttcontrolpacket_p.h"

--- a/src/mqtt/qmqttcontrolpacket_p.h
+++ b/src/mqtt/qmqttcontrolpacket_p.h
@ -1,5 +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

 #ifndef QMQTTCONTROLPACKET_P_H
 #define QMQTTCONTROLPACKET_P_H
--- a/src/mqtt/qmqttglobal.h
+++ b/src/mqtt/qmqttglobal.h
@ -1,5 +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

 #ifndef QTQMQTTGLOBAL_H
 #define QTQMQTTGLOBAL_H
--- a/src/mqtt/qmqttmessage.cpp
+++ b/src/mqtt/qmqttmessage.cpp
@ -1,5 +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

 #include "qmqttmessage.h"
 #include "qmqttmessage_p.h"
--- a/src/mqtt/qmqttmessage.h
+++ b/src/mqtt/qmqttmessage.h
@ -1,5 +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

 #ifndef QMQTTMESSAGE_H
 #define QMQTTMESSAGE_H
--- a/src/mqtt/qmqttmessage_p.h
+++ b/src/mqtt/qmqttmessage_p.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTMESSAGE_P_H
 #define QMQTTMESSAGE_P_H
--- a/src/mqtt/qmqttpublishproperties.cpp
+++ b/src/mqtt/qmqttpublishproperties.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #include "qmqttpublishproperties.h"
 #include "qmqttpublishproperties_p.h"
--- a/src/mqtt/qmqttpublishproperties.h
+++ b/src/mqtt/qmqttpublishproperties.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default
 #ifndef QMQTTPUBLISHPROPERTIES_H
 #define QMQTTPUBLISHPROPERTIES_H

--- a/src/mqtt/qmqttpublishproperties_p.h
+++ b/src/mqtt/qmqttpublishproperties_p.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTPUBLISHPROPERTIES_P_H
 #define QMQTTPUBLISHPROPERTIES_P_H
--- a/src/mqtt/qmqttsubscription.cpp
+++ b/src/mqtt/qmqttsubscription.cpp
@ -1,5 +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

 #include "qmqttsubscription.h"
 #include "qmqttsubscription_p.h"
--- a/src/mqtt/qmqttsubscription.h
+++ b/src/mqtt/qmqttsubscription.h
@ -1,5 +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

 #ifndef QMQTTSUBSCRIPTION_H
 #define QMQTTSUBSCRIPTION_H
--- a/src/mqtt/qmqttsubscription_p.h
+++ b/src/mqtt/qmqttsubscription_p.h
@ -1,5 +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

 #ifndef QMQTTSUBSCRIPTION_P_H
 #define QMQTTSUBSCRIPTION_P_H
--- a/src/mqtt/qmqttsubscriptionproperties.cpp
+++ b/src/mqtt/qmqttsubscriptionproperties.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #include "qmqttsubscriptionproperties.h"

--- a/src/mqtt/qmqttsubscriptionproperties.h
+++ b/src/mqtt/qmqttsubscriptionproperties.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTSUBSCRIPTIONPROPERTIES_H
 #define QMQTTSUBSCRIPTIONPROPERTIES_H
--- a/src/mqtt/qmqtttopicfilter.cpp
+++ b/src/mqtt/qmqtttopicfilter.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2017 Lorenz Haas
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:critical reason:data-parser

 #include "qmqtttopicfilter.h"

--- a/src/mqtt/qmqtttopicfilter.h
+++ b/src/mqtt/qmqtttopicfilter.h
@ -1,5 +1,6 @@
 // Copyright (C) 2017 Lorenz Haas
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTTOPICFILTER_H
 #define QMQTTTOPICFILTER_H
--- a/src/mqtt/qmqtttopicname.cpp
+++ b/src/mqtt/qmqtttopicname.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2017 Lorenz Haas
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #include "qmqtttopicname.h"

--- a/src/mqtt/qmqtttopicname.h
+++ b/src/mqtt/qmqtttopicname.h
@ -1,5 +1,6 @@
 // Copyright (C) 2017 Lorenz Haas
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTTOPICNAME_H
 #define QMQTTTOPICNAME_H
--- a/src/mqtt/qmqtttype.cpp
+++ b/src/mqtt/qmqtttype.cpp
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #include "qmqtttype.h"

--- a/src/mqtt/qmqtttype.h
+++ b/src/mqtt/qmqtttype.h
@ -1,5 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+// Qt-Security score:significant reason:default

 #ifndef QMQTTTYPE_H
 #define QMQTTTYPE_H