diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-04 01:14:49 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-04 01:14:49 (GMT) |
| commit | e042014961636d459dc84df93ad2cca96049e2d1 (patch) | |
| tree | 483fac9c3e0e88d60527c9675fd0789253204fb4 /tests/auto/qvariant/tst_qvariant.cpp | |
| parent | 25e7b091c44c1cff2f74551a0603e85b4c286260 (diff) | |
| parent | 8caacf51667d4cf770b18a8b59e46f842861210e (diff) | |
| download | Qt-e042014961636d459dc84df93ad2cca96049e2d1.zip Qt-e042014961636d459dc84df93ad2cca96049e2d1.tar.gz Qt-e042014961636d459dc84df93ad2cca96049e2d1.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'tests/auto/qvariant/tst_qvariant.cpp')
| -rw-r--r-- | tests/auto/qvariant/tst_qvariant.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 61e9a4f..e2a606f 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -3380,6 +3380,10 @@ void tst_QVariant::variantInVariant() QVariant var8 = qvariant_cast<QVariant>(QVariant::fromValue(QVariant::fromValue(str))); QCOMPARE((int)var8.type(), (int)QVariant::String); QCOMPARE(qvariant_cast<QString>(QVariant(qvariant_cast<QVariant>(var8))), str); + + QVariant var9(qMetaTypeId<QVariant>(), &var1); + QCOMPARE(var9.userType(), qMetaTypeId<QVariant>()); + QCOMPARE(qvariant_cast<QVariant>(var9), var1); } QTEST_MAIN(tst_QVariant) |