diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-04-05 08:39:19 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-06 06:19:54 +0000 |
| commit | e0ad7fa80d1c91c07ec43899d36fc84e8227ac75 (patch) | |
| tree | b93daad8956a07c744986cb6b9345df52ea6b28d | |
| parent | 21c6fdf6a1cdf0603fab390fd2e85bd47d142fb5 (diff) | |
QMetaType: don't create a registry just to query its emptiness [2/2]
The previous commit, b0e4d53b637e6c34457d14ed3f0be705098bf2f5, missed
this one. Same rationale as back then.
Change-Id: Ibad4c130e0d61c64808275fa7b97b58ebd479acc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 5f5c4598fed4b4bdd95271d1fee8a57fbd21d033)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index fc222ad9e8..3538d3cd47 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -148,9 +148,9 @@ Q_GLOBAL_STATIC(QMetaTypeCustomRegistry, customTypeRegistry) const char *QtMetaTypePrivate::typedefNameForType(const QtPrivate::QMetaTypeInterface *type_d) { const char *name = nullptr; - QMetaTypeCustomRegistry *r = customTypeRegistry; - if (!r) + if (!customTypeRegistry.exists()) return name; + QMetaTypeCustomRegistry *r = &*customTypeRegistry; QByteArrayView officialName(type_d->name); QReadLocker l(&r->lock); |