From b1d9331c156b7ff5c724600eee21ac50f4565868 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 19 Jul 2022 11:45:40 -0700
Subject: QMetaType: fix isRegistered()

It's not registered until an ID is assigned.

Pick-to: 6.4
Change-Id: I3859764fed084846bcb0fffd17034f5b369c5b4d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp')

diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index facd9992b9..9a3ab830cb 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -861,6 +861,7 @@ void tst_QMetaType::sizeOf()
 {
     QFETCH(int, type);
     QFETCH(size_t, size);
+    ignoreInvalidMetaTypeWarning(type);
     QCOMPARE(size_t(QMetaType::sizeOf(type)), size);
 }
 
@@ -873,6 +874,7 @@ void tst_QMetaType::sizeOfStaticLess()
 {
     QFETCH(int, type);
     QFETCH(size_t, size);
+    ignoreInvalidMetaTypeWarning(type);
     QCOMPARE(size_t(QMetaType(type).sizeOf()), size);
 }
 
@@ -909,6 +911,7 @@ void tst_QMetaType::alignOf()
 {
     QFETCH(int, type);
     QFETCH(size_t, size);
+    ignoreInvalidMetaTypeWarning(type);
     QCOMPARE(size_t(QMetaType(type).alignOf()), size);
 }
 
@@ -1534,6 +1537,12 @@ void tst_QMetaType::isRegisteredStaticLess()
     QCOMPARE(QMetaType(typeId).isRegistered(), registered);
 }
 
+struct NotARegisteredType {};
+void tst_QMetaType::isNotRegistered()
+{
+    QVERIFY(!QMetaType::fromType<NotARegisteredType>().isRegistered());
+}
+
 typedef QHash<int, uint> IntUIntHash;
 Q_DECLARE_METATYPE(IntUIntHash)
 typedef QMap<int, uint> IntUIntMap;
-- 
cgit v1.2.3