2 files changed, 4 insertions, 7 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 9ecad3bdf6..caeb9f656f 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -414,9 +414,7 @@ void tst_QMetaType::registerGadget(const char *name, const QList<GadgetPropertyT
     const auto flags = QMetaType::IsGadget | QMetaType::NeedsConstruction | QMetaType::NeedsDestruction;
     using TypeInfo = QtPrivate::QMetaTypeInterface;
     auto typeInfo = new TypeInfo {
-        0, sizeof(GenericGadgetType), alignof(GenericGadgetType), uint(flags), meta, name, 0,
-        QtPrivate::RefCount{ 0 },
-        [](TypeInfo *self) { delete self; },
+        0, alignof(GenericGadgetType), sizeof(GenericGadgetType), uint(flags), 0, meta, name,
         [](const TypeInfo *self, void *where) { GadgetTypedConstructor(self->typeId, where, nullptr); },
         [](const TypeInfo *self, void *where, const void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
         [](const TypeInfo *self, void *where, void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
@@ -1322,9 +1320,7 @@ void tst_QMetaType::typedConstruct()
     const auto flags = QMetaType::NeedsConstruction | QMetaType::NeedsDestruction;
     using TypeInfo = QtPrivate::QMetaTypeInterface;
     auto typeInfo = new TypeInfo {
-        0, sizeof(GenericGadgetType), alignof(GenericGadgetType), uint(flags), nullptr, podTypeName,
-        0, QtPrivate::RefCount{0},
-        [](TypeInfo *self) { delete self; },
+        0, alignof(GenericGadgetType), sizeof(GenericGadgetType), uint(flags), 0, nullptr, podTypeName,
         [](const TypeInfo *self, void *where) { GadgetTypedConstructor(self->typeId, where, nullptr); },
         [](const TypeInfo *self, void *where, const void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
         [](const TypeInfo *self, void *where, void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index d4af02baf1..1bcda67d83 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -1711,7 +1711,8 @@ void tst_QVariant::typeName_data()
     QTest::newRow("20") << int(QVariant::Region) << QByteArray("QRegion");
     QTest::newRow("21") << int(QVariant::Bitmap) << QByteArray("QBitmap");
     QTest::newRow("22") << int(QVariant::Cursor) << QByteArray("QCursor");
-    QTest::newRow("23") << int(QVariant::SizePolicy) << QByteArray("QSizePolicy");
+    // The test below doesn't work as long as we don't link against widgets
+//    QTest::newRow("23") << int(QVariant::SizePolicy) << QByteArray("QSizePolicy");
     QTest::newRow("24") << int(QVariant::Date) << QByteArray("QDate");
     QTest::newRow("25") << int(QVariant::Time) << QByteArray("QTime");
     QTest::newRow("26") << int(QVariant::DateTime) << QByteArray("QDateTime");