1 files changed, 28 insertions, 21 deletions

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index f20fd0cd87..867332e48f 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -3067,57 +3067,57 @@ void tst_QVariant::convertIterables() const
     {
         QStringList list;
         list.append("Hello");
-        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().count(), list.count());
+        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().size(), list.size());
     }
     {
         QByteArrayList list;
         list.append("Hello");
-        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().count(), list.count());
+        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().size(), list.size());
     }
     {
         QVariantList list;
         list.append("World");
-        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().count(), list.count());
+        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().size(), list.size());
     }
     {
         QMap<QString, int> map;
         map.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.size());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.size());
 
         map.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.size());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.size());
     }
     {
         QVariantMap map;
         map.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.size());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.size());
 
         map.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.size());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.size());
     }
     {
         QHash<QString, int> hash;
         hash.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.size());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.size());
 
         hash.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.size());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.size());
     }
     {
         QVariantHash hash;
         hash.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.size());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.size());
 
         hash.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.size());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.size());
     }
 }
 
@@ -4303,7 +4303,7 @@ void testSequentialIteration()
         int numSeen = 0;
         auto varList = listVariant.value<QVariantList>();
         auto varIter = varList.begin();
-        for (const QVariant &v : qAsConst(listIter)) {
+        for (const QVariant &v : std::as_const(listIter)) {
             QVERIFY(ContainerAPI<Container>::compare(v, *varIter));
             ++varIter;
             ++numSeen;
@@ -4715,6 +4715,13 @@ void tst_QVariant::metaEnums()
     METAENUMS_TEST(MetaEnumTest_Enum5_value);
     METAENUMS_TEST(MetaEnumTest_Enum6_value);
     METAENUMS_TEST(MetaEnumTest_Enum8_value);
+
+#undef METAENUMS_TEST
+
+    testVariantMeta(Qt::RichText, &ok, "RichText");
+    testVariantMeta(Qt::Alignment(Qt::AlignBottom), &ok, "AlignBottom");
+    testVariantMeta(Qt::Alignment(Qt::AlignHCenter | Qt::AlignBottom), &ok,
+                    "AlignHCenter|AlignBottom");
 }
 
 void tst_QVariant::nullConvert()
@@ -5166,7 +5173,7 @@ void tst_QVariant::constructFromIncompatibleMetaType()
 void tst_QVariant::copyNonDefaultConstructible()
 {
     NonDefaultConstructible ndc(42);
-    QVariant var(QMetaType::fromType<NonDefaultConstructible>(), &ndc);
+    QVariant var = QVariant::fromValue(ndc);
     QVERIFY(var.isDetached());
     QCOMPARE(var.metaType(), QMetaType::fromType<NonDefaultConstructible>());
     QVERIFY(var.constData() != &ndc);