diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
127 files changed, 137 insertions, 8 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 93877a1059..48229ee140 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -2,5 +2,6 @@ CONFIG += testcase TARGET = tst_qvariant QT += widgets network testlib SOURCES = tst_qvariant.cpp +RESOURCES += qvariant.qrc mac: CONFIG += insignificant_test # QTBUG-QTBUG-22747 diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.qrc b/tests/auto/corelib/kernel/qvariant/qvariant.qrc new file mode 100644 index 0000000000..e6f7bdac80 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/qvariant.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>stream/qt4.9/</file> + <file>stream/qt5.0/</file> +</qresource> +</RCC> diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin Binary files differnew file mode 100644 index 0000000000..7929cb4129 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin Binary files differnew file mode 100644 index 0000000000..3c15cb7850 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin Binary files differnew file mode 100644 index 0000000000..ac9ed179f2 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin Binary files differnew file mode 100644 index 0000000000..540c010dc9 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin Binary files differnew file mode 100644 index 0000000000..6b47a9aeb4 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin Binary files differnew file mode 100644 index 0000000000..66891d5ed8 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin Binary files differnew file mode 100644 index 0000000000..e534174651 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin Binary files differnew file mode 100644 index 0000000000..13f4dc374d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin Binary files differnew file mode 100644 index 0000000000..60ea8a2b08 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin Binary files differnew file mode 100644 index 0000000000..19897811d0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin Binary files differnew file mode 100644 index 0000000000..f4ef9df794 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin Binary files differnew file mode 100644 index 0000000000..ba1c332e14 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin Binary files differnew file mode 100644 index 0000000000..545fa96a1f --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin Binary files differnew file mode 100644 index 0000000000..d3281b1336 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin Binary files differnew file mode 100644 index 0000000000..664eb736a7 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin Binary files differnew file mode 100644 index 0000000000..b9b9ea633b --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin Binary files differnew file mode 100644 index 0000000000..76bc5d932f --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin Binary files differnew file mode 100644 index 0000000000..2f8713244c --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin Binary files differnew file mode 100644 index 0000000000..0ab1cbf6fa --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin Binary files differnew file mode 100644 index 0000000000..03db168e93 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin Binary files differnew file mode 100644 index 0000000000..f1f5cde63c --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin Binary files differnew file mode 100644 index 0000000000..4b1c2f05fb --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin Binary files differnew file mode 100644 index 0000000000..44d9d1c993 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin Binary files differnew file mode 100644 index 0000000000..f1c297a91d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin Binary files differnew file mode 100644 index 0000000000..fc88e2564a --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin Binary files differnew file mode 100644 index 0000000000..3a8b664a69 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin Binary files differnew file mode 100644 index 0000000000..1ad94631bd --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin Binary files differnew file mode 100644 index 0000000000..1eff5c83ad --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin Binary files differnew file mode 100644 index 0000000000..ce9cb8c434 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin Binary files differnew file mode 100644 index 0000000000..ca66b1ec4c --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin Binary files differnew file mode 100644 index 0000000000..7aebb46299 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin Binary files differnew file mode 100644 index 0000000000..fbdab8fffc --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin Binary files differnew file mode 100644 index 0000000000..01ee6dcdbc --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin Binary files differnew file mode 100644 index 0000000000..70730db7e1 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin Binary files differnew file mode 100644 index 0000000000..2f8dac670b --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin Binary files differnew file mode 100644 index 0000000000..db8518e064 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin Binary files differnew file mode 100644 index 0000000000..27eec8c4d5 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin Binary files differnew file mode 100644 index 0000000000..fec8c62c16 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin Binary files differnew file mode 100644 index 0000000000..210976a005 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin Binary files differnew file mode 100644 index 0000000000..00f1b2906e --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin Binary files differnew file mode 100644 index 0000000000..f44d7cbbc0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin Binary files differnew file mode 100644 index 0000000000..34e6f73ab5 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin Binary files differnew file mode 100644 index 0000000000..91382db9c4 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin Binary files differnew file mode 100644 index 0000000000..945dfc0ba9 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin Binary files differnew file mode 100644 index 0000000000..31f63fd1fb --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin Binary files differnew file mode 100644 index 0000000000..53c4db55f2 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin Binary files differnew file mode 100644 index 0000000000..e321e7d77d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin Binary files differnew file mode 100644 index 0000000000..4e444b7cc0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin Binary files differnew file mode 100644 index 0000000000..7d5c5303b8 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin Binary files differnew file mode 100644 index 0000000000..e2ffb002af --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin Binary files differnew file mode 100644 index 0000000000..cf95d44875 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin Binary files differnew file mode 100644 index 0000000000..6b0b1fb27d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin Binary files differnew file mode 100644 index 0000000000..a219ab66dd --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin Binary files differnew file mode 100644 index 0000000000..4444fb6236 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin Binary files differnew file mode 100644 index 0000000000..46bcc26f13 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin Binary files differnew file mode 100644 index 0000000000..124776f9d7 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin Binary files differnew file mode 100644 index 0000000000..1dea2c16c0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin Binary files differnew file mode 100644 index 0000000000..086e080224 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin Binary files differnew file mode 100644 index 0000000000..92dfdaad6c --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin Binary files differnew file mode 100644 index 0000000000..d386a76f1a --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin Binary files differnew file mode 100644 index 0000000000..7337dc7cfb --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin Binary files differnew file mode 100644 index 0000000000..7929cb4129 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin Binary files differnew file mode 100644 index 0000000000..4422f29a62 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin Binary files differnew file mode 100644 index 0000000000..ac9ed179f2 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin Binary files differnew file mode 100644 index 0000000000..fc7cca7d07 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin Binary files differnew file mode 100644 index 0000000000..6b47a9aeb4 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin Binary files differnew file mode 100644 index 0000000000..5a1ed0d740 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin Binary files differnew file mode 100644 index 0000000000..e534174651 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin Binary files differnew file mode 100644 index 0000000000..511e260744 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin Binary files differnew file mode 100644 index 0000000000..60ea8a2b08 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin Binary files differnew file mode 100644 index 0000000000..19897811d0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin Binary files differnew file mode 100644 index 0000000000..f4ef9df794 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin Binary files differnew file mode 100644 index 0000000000..ba1c332e14 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin Binary files differnew file mode 100644 index 0000000000..a7be10e143 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin Binary files differnew file mode 100644 index 0000000000..d3281b1336 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin Binary files differnew file mode 100644 index 0000000000..664eb736a7 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin Binary files differnew file mode 100644 index 0000000000..5cf664eb27 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin Binary files differnew file mode 100644 index 0000000000..e8aa03af9b --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin Binary files differnew file mode 100644 index 0000000000..bf3ca9ed4b --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin Binary files differnew file mode 100644 index 0000000000..03665c1edc --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin Binary files differnew file mode 100644 index 0000000000..7f7447a821 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin Binary files differnew file mode 100644 index 0000000000..f1f5cde63c --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin Binary files differnew file mode 100644 index 0000000000..4b1c2f05fb --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin Binary files differnew file mode 100644 index 0000000000..44d9d1c993 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin Binary files differnew file mode 100644 index 0000000000..f1c297a91d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin Binary files differnew file mode 100644 index 0000000000..93434b42c9 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin Binary files differnew file mode 100644 index 0000000000..8d3f9b81e8 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin Binary files differnew file mode 100644 index 0000000000..503c1a4664 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin Binary files differnew file mode 100644 index 0000000000..edafc2d185 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin Binary files differnew file mode 100644 index 0000000000..ce9cb8c434 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin Binary files differnew file mode 100644 index 0000000000..ca66b1ec4c --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin Binary files differnew file mode 100644 index 0000000000..7aebb46299 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin Binary files differnew file mode 100644 index 0000000000..8d3275df41 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin Binary files differnew file mode 100644 index 0000000000..3e85997f2d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin Binary files differnew file mode 100644 index 0000000000..c498f8fd08 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin Binary files differnew file mode 100644 index 0000000000..70730db7e1 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin Binary files differnew file mode 100644 index 0000000000..2f8dac670b --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin Binary files differnew file mode 100644 index 0000000000..db8518e064 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin Binary files differnew file mode 100644 index 0000000000..ecf01a8b31 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin Binary files differnew file mode 100644 index 0000000000..fec8c62c16 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin Binary files differnew file mode 100644 index 0000000000..210976a005 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin Binary files differnew file mode 100644 index 0000000000..cfdf49b4c2 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin Binary files differnew file mode 100644 index 0000000000..f44d7cbbc0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin Binary files differnew file mode 100644 index 0000000000..34e6f73ab5 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin Binary files differnew file mode 100644 index 0000000000..432068d921 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin Binary files differnew file mode 100644 index 0000000000..3b209f1be2 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin Binary files differnew file mode 100644 index 0000000000..31f63fd1fb --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin Binary files differnew file mode 100644 index 0000000000..52cddb5e93 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin Binary files differnew file mode 100644 index 0000000000..e321e7d77d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin Binary files differnew file mode 100644 index 0000000000..4e444b7cc0 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin Binary files differnew file mode 100644 index 0000000000..a8d57c6acd --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin Binary files differnew file mode 100644 index 0000000000..1c8bc45769 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin Binary files differnew file mode 100644 index 0000000000..e2ffb002af --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin Binary files differnew file mode 100644 index 0000000000..cf95d44875 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin Binary files differnew file mode 100644 index 0000000000..6b0b1fb27d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin Binary files differnew file mode 100644 index 0000000000..2bc3aeb18d --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin Binary files differnew file mode 100644 index 0000000000..b035f7f074 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin Binary files differnew file mode 100644 index 0000000000..a804c5e655 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin Binary files differnew file mode 100644 index 0000000000..e7ae61f176 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin Binary files differnew file mode 100644 index 0000000000..426f97426f --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin Binary files differnew file mode 100644 index 0000000000..086e080224 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin Binary files differnew file mode 100644 index 0000000000..399a9ea220 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin Binary files differnew file mode 100644 index 0000000000..25cb14e173 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin Binary files differnew file mode 100644 index 0000000000..7337dc7cfb --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index f40b1eae0b..f88e795167 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -262,6 +262,19 @@ private slots: void forwardDeclare(); void debugStream_data(); void debugStream(); + + void loadQt4Stream_data(); + void loadQt4Stream(); + void saveQt4Stream_data(); + void saveQt4Stream(); + void loadQt5Stream_data(); + void loadQt5Stream(); + void saveQt5Stream_data(); + void saveQt5Stream(); +private: + void dataStream_data(QDataStream::Version version); + void loadQVariantFromDataStream(QDataStream::Version version); + void saveQVariantFromDataStream(QDataStream::Version version); }; Q_DECLARE_METATYPE(QDate) @@ -2003,13 +2016,6 @@ Q_DECLARE_METATYPE(MyType*) void tst_QVariant::userType() { { - QVariant userVariant(QVariant::UserType); - - QVERIFY(userVariant.isValid()); - QVERIFY(userVariant.isNull()); - } - - { MyType data(1, "eins"); MyType data2(2, "zwei"); @@ -3338,6 +3344,123 @@ void tst_QVariant::forwardDeclare() QCOMPARE(qvariant_cast<Forward*>(v), f); } +void tst_QVariant::loadQt5Stream_data() +{ + dataStream_data(QDataStream::Qt_5_0); +} + +void tst_QVariant::loadQt5Stream() +{ + loadQVariantFromDataStream(QDataStream::Qt_5_0); +} + +void tst_QVariant::saveQt5Stream_data() +{ + dataStream_data(QDataStream::Qt_5_0); +} + +void tst_QVariant::saveQt5Stream() +{ + saveQVariantFromDataStream(QDataStream::Qt_5_0); +} + +void tst_QVariant::loadQt4Stream_data() +{ + dataStream_data(QDataStream::Qt_4_9); +} + +void tst_QVariant::loadQt4Stream() +{ + loadQVariantFromDataStream(QDataStream::Qt_4_9); +} + +void tst_QVariant::saveQt4Stream_data() +{ + dataStream_data(QDataStream::Qt_4_9); +} + +void tst_QVariant::saveQt4Stream() +{ + saveQVariantFromDataStream(QDataStream::Qt_4_9); +} + +void tst_QVariant::dataStream_data(QDataStream::Version version) +{ + QTest::addColumn<QString>("fileName"); + + QString path; + switch (version) { + case QDataStream::Qt_4_9: + path = QString::fromLatin1("qt4.9"); + break; + case QDataStream::Qt_5_0: + path = QString::fromLatin1("qt5.0"); + break; + default: + Q_UNIMPLEMENTED(); + } + + path = path.prepend(":/stream/").append("/"); + QDir dir(path); + uint i = 0; + foreach (const QFileInfo &fileInfo, dir.entryInfoList(QStringList() << "*.bin")) { + QTest::newRow((path + fileInfo.fileName()).toLatin1()) << fileInfo.filePath(); + i += 1; + } + QVERIFY(i > 10); +} + +void tst_QVariant::loadQVariantFromDataStream(QDataStream::Version version) +{ + QFETCH(QString, fileName); + + QFile file(fileName); + QVERIFY(file.open(QIODevice::ReadOnly)); + + QDataStream stream(&file); + stream.setVersion(version); + + QString typeName; + QVariant loadedVariant; + stream >> typeName >> loadedVariant; + + const int id = QMetaType::type(typeName.toLatin1()); + QVariant constructedVariant(static_cast<QVariant::Type>(id)); + QCOMPARE(constructedVariant.userType(), id); + QCOMPARE(QMetaType::typeName(loadedVariant.userType()), typeName.toLatin1().constData()); + QCOMPARE(loadedVariant.userType(), constructedVariant.userType()); +} + +void tst_QVariant::saveQVariantFromDataStream(QDataStream::Version version) +{ + QFETCH(QString, fileName); + + QFile file(fileName); + QVERIFY(file.open(QIODevice::ReadOnly)); + QDataStream dataFileStream(&file); + + QString typeName; + dataFileStream >> typeName; + QByteArray data = file.readAll(); + const int id = QMetaType::type(typeName.toLatin1()); + + QBuffer buffer; + buffer.open(QIODevice::ReadWrite); + QDataStream stream(&buffer); + stream.setVersion(version); + + QVariant constructedVariant(static_cast<QVariant::Type>(id)); + QCOMPARE(constructedVariant.userType(), id); + stream << constructedVariant; + + // We are testing QVariant there is no point in testing full array. + QCOMPARE(buffer.data().left(5), data.left(5)); + + buffer.seek(0); + QVariant recunstructedVariant; + stream >> recunstructedVariant; + QCOMPARE(recunstructedVariant.userType(), constructedVariant.userType()); +} class MessageHandler { public: @@ -3397,6 +3520,5 @@ void tst_QVariant::debugStream() QVERIFY(msgHandler.testPassed()); } - QTEST_MAIN(tst_QVariant) #include "tst_qvariant.moc" |