diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-06-08 20:48:02 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-09 10:21:38 +0000 |
| commit | ee8ab3695a07caec782c0ac8a573fdd42e8ba146 (patch) | |
| tree | 209dbcb7ad286989d5c0af38b2de26fce286cf72 /src | |
| parent | d06c4fbe55bc091137acf83b31682dcffa206a40 (diff) | |
Revert "QMetaType: Don't normalize name which should already be normalized"
This reverts commit f6fa4b39ee32ba4a5c6a3db5581dd50b3afc7a47.
Reason for revert: c76a2d7c9cfc5e2edd45a30681df51b37125bc01 was
not enough to catch all cases.
Change-Id: I5830ab20b1f4d26a0a201c3dd5aaee6b10aa12ac
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 27952957d783034f7eba1133a6c26a351501099c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index e8c631f2d1..65745bf06a 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -120,10 +120,11 @@ struct QMetaTypeCustomRegistry QWriteLocker l(&lock); if (ti->typeId) return ti->typeId; - QByteArray name = ti->name; + QByteArray name = #ifndef QT_NO_QOBJECT - Q_ASSERT(name == QMetaObject::normalizedType(ti->name)); + QMetaObject::normalizedType #endif + (ti->name); if (auto ti2 = aliases.value(name)) { ti->typeId.storeRelaxed(ti2->typeId.loadRelaxed()); return ti2->typeId; |