Revert "QMetaType: Don't normalize name which should already be normalized"

This reverts commit f6fa4b39ee.

Reason for revert: c76a2d7c9c was
not enough to catch all cases.

Pick-to: 6.2
Change-Id: I5830ab20b1f4d26a0a201c3dd5aaee6b10aa12ac
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fabian Kosmale 2021-06-08 20:48:02 +00:00
parent 03650696a1
commit 27952957d7

View File

@ -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;