diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-26 11:32:55 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-26 11:33:19 +0200 |
| commit | 7810209ba32fcebfa90b081670595daaa5333a78 (patch) | |
| tree | 98410d5cc7d9d762bbde0cb4eae8041aa6e2e542 /src/dbus/qdbusmetatype.cpp | |
| parent | 6f2eabb54e3f827ebd2b90f68144b86342933869 (diff) | |
| parent | 88625709058b386ee74cca536c6c5556159c99fa (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4ea2b77cc201daed94fbe321f146dfd20365a534
Diffstat (limited to 'src/dbus/qdbusmetatype.cpp')
| -rw-r--r-- | src/dbus/qdbusmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index 0729a3cbbb..58ce4f8930 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -93,7 +93,7 @@ void QDBusMetaTypeId::init() // reentrancy is not a problem since everything else is locked on their own // set the guard variable at the end - if (!initialized.load()) { + if (!initialized.loadRelaxed()) { // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly) (void)message(); (void)argument(); @@ -145,7 +145,7 @@ void QDBusMetaTypeId::init() qDBusRegisterMetaType<QVector<QDBusUnixFileDescriptor> >(); #endif - initialized.store(true); + initialized.storeRelaxed(true); } } |