diff -r dee5afe5301f -r 3f74d0d4af4c tests/auto/qvariant/tst_qvariant.cpp --- a/tests/auto/qvariant/tst_qvariant.cpp Mon Mar 15 12:43:09 2010 +0200 +++ b/tests/auto/qvariant/tst_qvariant.cpp Thu Apr 08 14:19:33 2010 +0300 @@ -1968,6 +1968,10 @@ QTest::newRow("HashSecondLarger") << QVariant(hash1) << QVariant(hash2) << false; } + + QTest::newRow( "UserType" ) << QVariant(QVariant::UserType) << QVariant(QVariant::UserType) << true; + QVariant mUserType(QVariant::UserType); + QTest::newRow( "Shared UserType" ) << mUserType << mUserType << true; } void tst_QVariant::operator_eq_eq() @@ -3200,7 +3204,10 @@ return x == o.x && y == o.y; } }; + +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE); +QT_END_NAMESPACE struct MyData { @@ -3239,7 +3246,9 @@ int MyMovable::count = 0; +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE); +QT_END_NAMESPACE Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(MyPrimitive)