1 files changed, 38 insertions, 1 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 6059364..fc977bc 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -268,6 +268,8 @@ private slots:
     void toIntFromQString() const;
     void toIntFromDouble() const;
     void task256984_setValue();
+
+    void numericalConvert();
 };
 
 Q_DECLARE_METATYPE(QDate)
@@ -2621,7 +2623,7 @@ void tst_QVariant::qvariant_cast_QObject_data() {
 
     QTest::addColumn<QVariant>("data");
     QTest::addColumn<bool>("success");
-    QTest::newRow("from QObject") << QVariant(QMetaType::QObjectStar, new QObject) << true;
+    QTest::newRow("from QObject") << QVariant(QMetaType::QObjectStar, new QObject(this)) << true;
     QTest::newRow("from String") << QVariant(QLatin1String("1, 2, 3")) << false;
     QTest::newRow("from int") << QVariant((int) 123) << false;
 }
@@ -2746,6 +2748,7 @@ void tst_QVariant::dataStar() const
 
     v2 = qVariantFromValue(p1);
     QVERIFY(v1 == v2);
+    delete p1;
 }
 
 void tst_QVariant::canConvertQStringList() const
@@ -3091,6 +3094,40 @@ void tst_QVariant::task256984_setValue()
     QVERIFY( v2.isDetached() );
 }
 
+void tst_QVariant::numericalConvert()
+{
+    QVariant vfloat(float(5.3));
+    QVariant vdouble(double(5.3));
+    QVariant vreal(qreal(5.3));
+    QVariant vint(int(5));
+    QVariant vuint(uint(5));
+    QVariant vshort(short(5));
+    QVariant vlonglong(quint64(5));
+    QVariant vstringint(QString::fromLatin1("5"));
+    QVariant vstring(QString::fromLatin1("5.3"));
+
+    QVector<QVariant *> vect;
+    vect << &vfloat << &vdouble << &vreal << &vint << &vuint << &vshort<< &vlonglong << &vstringint << &vstring;
+
+    for(int i = 0; i < vect.size(); i++) {
+        double num = 5.3;
+        if (i >= 3 && i <= 7)
+            num = 5;
+        QVariant *v = vect.at(i);
+        QCOMPARE(v->toFloat() , float(num));
+        QCOMPARE(float(v->toReal()) , float(num));
+        QCOMPARE(float(v->toDouble()) , float(num));
+        if(i != 8) {
+            QCOMPARE(v->toInt() , int(num));
+            QCOMPARE(v->toUInt() , uint(num));
+            QCOMPARE(v->toULongLong() , quint64(num));
+        }
+        QCOMPARE(v->toString() , QString::number(num));
+    }
+}
+
+
+
 
 QTEST_MAIN(tst_QVariant)
 #include "tst_qvariant.moc"