From 27952957d783034f7eba1133a6c26a351501099c Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Tue, 8 Jun 2021 20:48:02 +0000
Subject: 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.

Pick-to: 6.2
Change-Id: I5830ab20b1f4d26a0a201c3dd5aaee6b10aa12ac
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/corelib/kernel/qmetatype.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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;
-- 
cgit v1.2.3