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 /src/remoteobjects/qremoteobjectreplica.cpp | |
| 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
Diffstat (limited to 'src/remoteobjects/qremoteobjectreplica.cpp')
| -rw-r--r-- | src/remoteobjects/qremoteobjectreplica.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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(); + } } } |