diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 21:47:47 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 21:47:47 +0200 |
| commit | 4cf461596e01645c789ba6544fc79f47be151828 (patch) | |
| tree | 5daf5623d433b35b31cb2e674e22e13c8122c2dc | |
| parent | e2dc280fb8a954d4562aa2ecbeaf5a8d2fc0a6f1 (diff) | |
| parent | c1ccf030ec815ba63e0b52de1aa9106aaf683fe2 (diff) | |
Merge tag 'v6.2.12-lts' into tqtc/lts-6.2-opensourcev6.2.12-lts-lgpl6.2
Qt 6.2.12-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I434ae027d6d56454d18949afe2038aa2a7274986
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectcontainers_p.h | 5 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectreplica.cpp | 6 |
5 files changed, 11 insertions, 6 deletions
diff --git a/.cmake.conf b/.cmake.conf index 842b347..7733def 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.11") +set(QT_REPO_MODULE_VERSION "6.2.12") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 5e5a84e..02d06ed 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,6 +4,6 @@ CONFIG += qt_example_installs DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 QTRO_SOURCE_TREE = $$PWD diff --git a/dependencies.yaml b/dependencies.yaml index d8bcb3c..54cd9d4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,5 +3,5 @@ dependencies: ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 required: true ../tqtc-qtdeclarative: - ref: d8a396b76168b66b8cd938f61d8d958ebdb14871 + ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde required: false diff --git a/src/remoteobjects/qremoteobjectcontainers_p.h b/src/remoteobjects/qremoteobjectcontainers_p.h index 2be67c8..43aa825 100644 --- a/src/remoteobjects/qremoteobjectcontainers_p.h +++ b/src/remoteobjects/qremoteobjectcontainers_p.h @@ -37,7 +37,8 @@ ** ****************************************************************************/ -#pragma once +#ifndef QREMOTEOBJECTCONTAINERS_P_H +#define QREMOTEOBJECTCONTAINERS_P_H // // W A R N I N G @@ -118,3 +119,5 @@ QDataStream &operator>>(QDataStream &ds, QtROAssociativeContainer &p); QDataStream &operator<<(QDataStream &ds, const QtROAssociativeContainer &p); QT_END_NAMESPACE + +#endif // QREMOTEOBJECTCONTAINERS_P_H diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp index 6a59385..6cca831 100644 --- a/src/remoteobjects/qremoteobjectreplica.cpp +++ b/src/remoteobjects/qremoteobjectreplica.cpp @@ -155,8 +155,10 @@ QConnectedReplicaImplementation::~QConnectedReplicaImplementation() sendCommand(); } for (auto prop : m_propertyStorage) { - if (prop.canConvert<QObject*>()) - prop.value<QObject *>()->deleteLater(); + if (prop.canConvert<QObject*>()) { + if (auto o = prop.value<QObject*>()) + o->deleteLater(); + } } } |