diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 14:39:29 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 14:39:29 +0200 |
| commit | e59ee48a8656d04339967ad99334bd0ddca0c956 (patch) | |
| tree | 4fe72429115ae4a4171cd3f1f06d9a3a425973d0 /tests/auto/qvariant | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
| parent | 508b447075fb852e61ddf88c92c9099dad292747 (diff) | |
Merge commit 'qt/master'
Diffstat (limited to 'tests/auto/qvariant')
| -rw-r--r-- | tests/auto/qvariant/tst_qvariant.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 729e29b8f4..fc977bc8e7 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -2623,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; } @@ -2748,6 +2748,7 @@ void tst_QVariant::dataStar() const v2 = qVariantFromValue(p1); QVERIFY(v1 == v2); + delete p1; } void tst_QVariant::canConvertQStringList() const |