diff -r b72c6db6890b -r 5dc02b23752f tests/auto/qvariant/tst_qvariant.cpp
--- a/tests/auto/qvariant/tst_qvariant.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/tests/auto/qvariant/tst_qvariant.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -2522,15 +2522,23 @@
     QCOMPARE(qVariantFromValue(0.25f).toDouble(), 0.25);
 }
 
+struct Blah { int i; };
+
+QDataStream& operator>>(QDataStream& s, Blah& c)
+{ return (s >> c.i); }
+
+QDataStream& operator<<(QDataStream& s, const Blah& c)
+{ return (s << c.i); }
+
 void tst_QVariant::saveLoadCustomTypes()
 {
     QByteArray data;
 
-    int i = 42;
-    int tp = qRegisterMetaType<int>("Blah");
+    Blah i = { 42 };
+    int tp = qRegisterMetaType<Blah>("Blah");
     QVariant v = QVariant(tp, &i);
 
-    qRegisterMetaTypeStreamOperators<int>("Blah");
+    qRegisterMetaTypeStreamOperators<Blah>("Blah");
 
     QCOMPARE(v.userType(), tp);
     QVERIFY(v.type() == QVariant::UserType);