diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:05:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:05:11 +0200 |
| commit | 62609eb33744bf5f8dd24bd9e4b8bbf8c6b687a9 (patch) | |
| tree | 76d5cf4e5e05590d3382f48167ddd4ca89690611 | |
| parent | df9e9a756c93f2a09144a706635a449626781c9e (diff) | |
| parent | b2e0bf60442a09d16dbe89e916c8e1b9e0c0223f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic56dd8e5eb31e2fec3d7692620a6c394f375954c
| -rw-r--r-- | src/remoteobjects/qremoteobjectpendingcall.h | 2 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectreplica_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/remoteobjects/qremoteobjectpendingcall.h b/src/remoteobjects/qremoteobjectpendingcall.h index 086e5d8..b9709fc 100644 --- a/src/remoteobjects/qremoteobjectpendingcall.h +++ b/src/remoteobjects/qremoteobjectpendingcall.h @@ -140,7 +140,7 @@ struct QMetaTypeId< QRemoteObjectPendingReply<T> > static int qt_metatype_id() { static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); - if (const int id = metatype_id.load()) + if (const int id = metatype_id.loadRelaxed()) return id; const char *tName = QMetaType::typeName(qMetaTypeId<T>()); Q_ASSERT(tName); diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h index 79a07cf..8acefda 100644 --- a/src/remoteobjects/qremoteobjectreplica_p.h +++ b/src/remoteobjects/qremoteobjectreplica_p.h @@ -117,7 +117,7 @@ public: void setProperty(int i, const QVariant &) override = 0; virtual bool isShortCircuit() const = 0; bool isInitialized() const override { return true; } - QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State(m_state.load()); } + QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State(m_state.loadRelaxed()); } void setState(QRemoteObjectReplica::State state); bool waitForSource(int) override { return true; } virtual bool waitForFinished(const QRemoteObjectPendingCall &, int) { return true; } |