summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qmetatype.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r--src/corelib/kernel/qmetatype.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 06dbdbde18..71fcc6d407 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -490,8 +490,8 @@ bool QMetaType::isRegistered() const
int QMetaType::id() const
{
if (d_ptr) {
- if (d_ptr->typeId)
- return d_ptr->typeId;
+ if (int id = d_ptr->typeId.loadRelaxed())
+ return id;
auto reg = customTypeRegistry();
if (reg) {
return reg->registerCustomType(d_ptr);