diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 14:51:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:24:39 +0200 |
| commit | 13374ceb165c44658aa97890c37b206859c9a31c (patch) | |
| tree | 562362b196a459ee3449a5a1e60e5216a9dd6984 /src/qml/memory/qv4heap_p.h | |
| parent | ae47deba4c943c496412530a8d2a5a688ae12038 (diff) | |
| parent | b5d18be5a03406d0aac83856dd41e1525fd14a28 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I2963c1209316fb6755f572969f368970450d7991
Diffstat (limited to 'src/qml/memory/qv4heap_p.h')
| -rw-r--r-- | src/qml/memory/qv4heap_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h index 07af5a6f7a..d7cfa193e6 100644 --- a/src/qml/memory/qv4heap_p.h +++ b/src/qml/memory/qv4heap_p.h @@ -234,7 +234,7 @@ struct QQmlQPointer { } T *data() const { - return d == nullptr || d->strongref.load() == 0 ? nullptr : qObject; + return d == nullptr || d->strongref.loadRelaxed() == 0 ? nullptr : qObject; } operator T*() const { return data(); } inline T* operator->() const { return data(); } @@ -247,7 +247,7 @@ struct QQmlQPointer { } bool isNull() const Q_DECL_NOTHROW { - return d == nullptr || qObject == nullptr || d->strongref.load() == 0; + return d == nullptr || qObject == nullptr || d->strongref.loadRelaxed() == 0; } private: |