2 files changed, 16 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index d0f68db4a2..7ba96b236f 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -57,6 +57,7 @@ private slots:
     void signal();
     void constructor();
     void property();
+    void variantProperty();
     void notifySignal();
     void enumerator();
     void classInfo();
@@ -727,6 +728,20 @@ void tst_QMetaObjectBuilder::property()
     QCOMPARE(builder.method(0).signature(), QByteArray("propChanged(QString)"));
 }
 
+void tst_QMetaObjectBuilder::variantProperty()
+{
+    QMetaObjectBuilder builder;
+    builder.addProperty("variant", "const QVariant &");
+    QMetaObject *meta = builder.toMetaObject();
+
+    QMetaProperty prop = meta->property(meta->propertyOffset());
+    QCOMPARE(QMetaType::Type(prop.type()), QMetaType::QVariant);
+    QCOMPARE(QMetaType::Type(prop.userType()), QMetaType::QVariant);
+    QCOMPARE(QByteArray(prop.typeName()), QByteArray("QVariant"));
+
+    qFree(meta);
+}
+
 void tst_QMetaObjectBuilder::notifySignal()
 {
     QMetaObjectBuilder builder;
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index dec34a8fa0..c1471e4f21 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -1671,7 +1671,7 @@ void tst_QObject::property()
 
     const int idx = mo->indexOfProperty("variant");
     QVERIFY(idx != -1);
-    QVERIFY(mo->property(idx).type() == QVariant::LastType);
+    QCOMPARE(QMetaType::Type(mo->property(idx).type()), QMetaType::QVariant);
     QCOMPARE(object.property("variant"), QVariant());
     QVariant variant1(42);
     QVariant variant2("string");