From aee1f6cc413f56bf4962324799ee3887c3dd037f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 13 Jan 2012 10:41:02 +0100 Subject: Cleanup mess in public type ids. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no reason to keep two separated core types sets. It couldn't be fixed before Qt5 because of binary compatibility promise. This patch merges QMetaType core types with ext core types. This "simple" operation consists of: - QDataStream version was incremented, because type ids are saved in QVariant's data stream. - QMetaType LastExtCoreType and FirstExtCoreType were replaced by LastCoreType, FirstCoreType and new QMetaType::HighestInternalId. - New tests checking QVariant data stream for Qt4 and for Qt5 versions were added. Change-Id: I02dd74d29317365c297a789a4eb7c9c5edc3b231 Reviewed-by: João Abecasis --- tests/auto/corelib/kernel/qvariant/qvariant.pro | 1 + tests/auto/corelib/kernel/qvariant/qvariant.qrc | 6 + .../corelib/kernel/qvariant/stream/qt4.9/bool.bin | Bin 0 -> 18 bytes .../corelib/kernel/qvariant/stream/qt4.9/char.bin | Bin 0 -> 18 bytes .../kernel/qvariant/stream/qt4.9/double.bin | Bin 0 -> 29 bytes .../corelib/kernel/qvariant/stream/qt4.9/float.bin | Bin 0 -> 27 bytes .../corelib/kernel/qvariant/stream/qt4.9/int.bin | Bin 0 -> 19 bytes .../corelib/kernel/qvariant/stream/qt4.9/long.bin | Bin 0 -> 25 bytes .../kernel/qvariant/stream/qt4.9/qbitarray.bin | Bin 0 -> 31 bytes .../kernel/qvariant/stream/qt4.9/qbitmap.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/qbrush.bin | Bin 0 -> 105 bytes .../kernel/qvariant/stream/qt4.9/qbytearray.bin | Bin 0 -> 33 bytes .../corelib/kernel/qvariant/stream/qt4.9/qchar.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt4.9/qcolor.bin | Bin 0 -> 32 bytes .../kernel/qvariant/stream/qt4.9/qcursor.bin | Bin 0 -> 25 bytes .../corelib/kernel/qvariant/stream/qt4.9/qdate.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt4.9/qdatetime.bin | Bin 0 -> 36 bytes .../kernel/qvariant/stream/qt4.9/qeasingcurve.bin | Bin 0 -> 43 bytes .../corelib/kernel/qvariant/stream/qt4.9/qfont.bin | Bin 0 -> 73 bytes .../corelib/kernel/qvariant/stream/qt4.9/qicon.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt4.9/qimage.bin | Bin 0 -> 25 bytes .../kernel/qvariant/stream/qt4.9/qkeysequence.bin | Bin 0 -> 41 bytes .../corelib/kernel/qvariant/stream/qt4.9/qline.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qlinef.bin | Bin 0 -> 53 bytes .../kernel/qvariant/stream/qt4.9/qlocale.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt4.9/qlonglong.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qmatrix.bin | Bin 0 -> 71 bytes .../kernel/qvariant/stream/qt4.9/qmatrix4x4.bin | Bin 0 -> 157 bytes .../kernel/qvariant/stream/qt4.9/qpalette.bin | Bin 0 -> 5065 bytes .../corelib/kernel/qvariant/stream/qt4.9/qpen.bin | Bin 0 -> 132 bytes .../kernel/qvariant/stream/qt4.9/qpixmap.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/qpoint.bin | Bin 0 -> 29 bytes .../kernel/qvariant/stream/qt4.9/qpointf.bin | Bin 0 -> 39 bytes .../kernel/qvariant/stream/qt4.9/qpolygon.bin | Bin 0 -> 29 bytes .../kernel/qvariant/stream/qt4.9/qquaternion.bin | Bin 0 -> 63 bytes .../corelib/kernel/qvariant/stream/qt4.9/qrect.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qrectf.bin | Bin 0 -> 53 bytes .../kernel/qvariant/stream/qt4.9/qregexp.bin | Bin 0 -> 30 bytes .../kernel/qvariant/stream/qt4.9/qregion.bin | Bin 0 -> 27 bytes .../corelib/kernel/qvariant/stream/qt4.9/qsize.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/qsizef.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt4.9/qsizepolicy.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qstring.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/qstringlist.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qtextformat.bin | Bin 0 -> 39 bytes .../kernel/qvariant/stream/qt4.9/qtextlength.bin | Bin 0 -> 43 bytes .../corelib/kernel/qvariant/stream/qt4.9/qtime.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt4.9/qtransform.bin | Bin 0 -> 101 bytes .../kernel/qvariant/stream/qt4.9/qulonglong.bin | Bin 0 -> 37 bytes .../corelib/kernel/qvariant/stream/qt4.9/qurl.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt4.9/qvariant.bin | Bin 0 -> 34 bytes .../kernel/qvariant/stream/qt4.9/qvarianthash.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt4.9/qvariantlist.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt4.9/qvariantmap.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qvector2d.bin | Bin 0 -> 43 bytes .../kernel/qvariant/stream/qt4.9/qvector3d.bin | Bin 0 -> 51 bytes .../kernel/qvariant/stream/qt4.9/qvector4d.bin | Bin 0 -> 59 bytes .../corelib/kernel/qvariant/stream/qt4.9/short.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/stream/qt4.9/uchar.bin | Bin 0 -> 20 bytes .../corelib/kernel/qvariant/stream/qt4.9/uint.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/stream/qt4.9/ulong.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/ushort.bin | Bin 0 -> 23 bytes .../corelib/kernel/qvariant/stream/qt4.9/void.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/stream/qt5.0/bool.bin | Bin 0 -> 18 bytes .../corelib/kernel/qvariant/stream/qt5.0/char.bin | Bin 0 -> 18 bytes .../kernel/qvariant/stream/qt5.0/double.bin | Bin 0 -> 29 bytes .../corelib/kernel/qvariant/stream/qt5.0/float.bin | Bin 0 -> 27 bytes .../corelib/kernel/qvariant/stream/qt5.0/int.bin | Bin 0 -> 19 bytes .../corelib/kernel/qvariant/stream/qt5.0/long.bin | Bin 0 -> 25 bytes .../kernel/qvariant/stream/qt5.0/qbitarray.bin | Bin 0 -> 31 bytes .../kernel/qvariant/stream/qt5.0/qbitmap.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qbrush.bin | Bin 0 -> 105 bytes .../kernel/qvariant/stream/qt5.0/qbytearray.bin | Bin 0 -> 33 bytes .../corelib/kernel/qvariant/stream/qt5.0/qchar.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt5.0/qcolor.bin | Bin 0 -> 32 bytes .../kernel/qvariant/stream/qt5.0/qcursor.bin | Bin 0 -> 25 bytes .../corelib/kernel/qvariant/stream/qt5.0/qdate.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt5.0/qdatetime.bin | Bin 0 -> 36 bytes .../kernel/qvariant/stream/qt5.0/qeasingcurve.bin | Bin 0 -> 43 bytes .../corelib/kernel/qvariant/stream/qt5.0/qfont.bin | Bin 0 -> 89 bytes .../corelib/kernel/qvariant/stream/qt5.0/qicon.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt5.0/qimage.bin | Bin 0 -> 25 bytes .../kernel/qvariant/stream/qt5.0/qkeysequence.bin | Bin 0 -> 41 bytes .../corelib/kernel/qvariant/stream/qt5.0/qline.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qlinef.bin | Bin 0 -> 53 bytes .../kernel/qvariant/stream/qt5.0/qlocale.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt5.0/qlonglong.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qmatrix.bin | Bin 0 -> 71 bytes .../kernel/qvariant/stream/qt5.0/qmatrix4x4.bin | Bin 0 -> 157 bytes .../kernel/qvariant/stream/qt5.0/qpalette.bin | Bin 0 -> 5065 bytes .../corelib/kernel/qvariant/stream/qt5.0/qpen.bin | Bin 0 -> 132 bytes .../kernel/qvariant/stream/qt5.0/qpixmap.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qpoint.bin | Bin 0 -> 29 bytes .../kernel/qvariant/stream/qt5.0/qpointf.bin | Bin 0 -> 39 bytes .../kernel/qvariant/stream/qt5.0/qpolygon.bin | Bin 0 -> 29 bytes .../kernel/qvariant/stream/qt5.0/qpolygonf.bin | Bin 0 -> 31 bytes .../kernel/qvariant/stream/qt5.0/qquaternion.bin | Bin 0 -> 63 bytes .../corelib/kernel/qvariant/stream/qt5.0/qrect.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qrectf.bin | Bin 0 -> 53 bytes .../kernel/qvariant/stream/qt5.0/qregexp.bin | Bin 0 -> 30 bytes .../kernel/qvariant/stream/qt5.0/qregion.bin | Bin 0 -> 27 bytes .../corelib/kernel/qvariant/stream/qt5.0/qsize.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qsizef.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt5.0/qsizepolicy.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qstring.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qstringlist.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qtextformat.bin | Bin 0 -> 39 bytes .../kernel/qvariant/stream/qt5.0/qtextlength.bin | Bin 0 -> 43 bytes .../corelib/kernel/qvariant/stream/qt5.0/qtime.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt5.0/qtransform.bin | Bin 0 -> 101 bytes .../kernel/qvariant/stream/qt5.0/qulonglong.bin | Bin 0 -> 37 bytes .../corelib/kernel/qvariant/stream/qt5.0/qurl.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/stream/qt5.0/quuid.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qvariant.bin | Bin 0 -> 34 bytes .../kernel/qvariant/stream/qt5.0/qvarianthash.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt5.0/qvariantlist.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt5.0/qvariantmap.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qvector2d.bin | Bin 0 -> 43 bytes .../kernel/qvariant/stream/qt5.0/qvector3d.bin | Bin 0 -> 51 bytes .../kernel/qvariant/stream/qt5.0/qvector4d.bin | Bin 0 -> 59 bytes .../corelib/kernel/qvariant/stream/qt5.0/short.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/stream/qt5.0/uchar.bin | Bin 0 -> 20 bytes .../corelib/kernel/qvariant/stream/qt5.0/uint.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/stream/qt5.0/ulong.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/ushort.bin | Bin 0 -> 23 bytes .../corelib/kernel/qvariant/stream/qt5.0/void.bin | Bin 0 -> 21 bytes .../auto/corelib/kernel/qvariant/tst_qvariant.cpp | 138 +++++++++++++++++++-- 127 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 tests/auto/corelib/kernel/qvariant/qvariant.qrc create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin (limited to 'tests/auto/corelib/kernel') 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 @@ + + + stream/qt4.9/ + stream/qt5.0/ + + diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin new file mode 100644 index 0000000000..7929cb4129 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin new file mode 100644 index 0000000000..3c15cb7850 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin new file mode 100644 index 0000000000..ac9ed179f2 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin new file mode 100644 index 0000000000..540c010dc9 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin new file mode 100644 index 0000000000..6b47a9aeb4 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin new file mode 100644 index 0000000000..66891d5ed8 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin new file mode 100644 index 0000000000..e534174651 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin new file mode 100644 index 0000000000..13f4dc374d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin new file mode 100644 index 0000000000..60ea8a2b08 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin new file mode 100644 index 0000000000..19897811d0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin new file mode 100644 index 0000000000..f4ef9df794 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin new file mode 100644 index 0000000000..ba1c332e14 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin new file mode 100644 index 0000000000..545fa96a1f Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin new file mode 100644 index 0000000000..d3281b1336 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin new file mode 100644 index 0000000000..664eb736a7 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin new file mode 100644 index 0000000000..b9b9ea633b Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin new file mode 100644 index 0000000000..76bc5d932f Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin new file mode 100644 index 0000000000..2f8713244c Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin new file mode 100644 index 0000000000..0ab1cbf6fa Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin new file mode 100644 index 0000000000..03db168e93 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin new file mode 100644 index 0000000000..f1f5cde63c Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin new file mode 100644 index 0000000000..4b1c2f05fb Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin new file mode 100644 index 0000000000..44d9d1c993 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin new file mode 100644 index 0000000000..f1c297a91d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin new file mode 100644 index 0000000000..fc88e2564a Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin new file mode 100644 index 0000000000..3a8b664a69 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin new file mode 100644 index 0000000000..1ad94631bd Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin new file mode 100644 index 0000000000..1eff5c83ad Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin new file mode 100644 index 0000000000..ce9cb8c434 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin new file mode 100644 index 0000000000..ca66b1ec4c Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin new file mode 100644 index 0000000000..7aebb46299 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin new file mode 100644 index 0000000000..fbdab8fffc Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin new file mode 100644 index 0000000000..01ee6dcdbc Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin new file mode 100644 index 0000000000..70730db7e1 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin new file mode 100644 index 0000000000..2f8dac670b Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin new file mode 100644 index 0000000000..db8518e064 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin new file mode 100644 index 0000000000..27eec8c4d5 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin new file mode 100644 index 0000000000..fec8c62c16 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin new file mode 100644 index 0000000000..210976a005 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin new file mode 100644 index 0000000000..00f1b2906e Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin new file mode 100644 index 0000000000..f44d7cbbc0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin new file mode 100644 index 0000000000..34e6f73ab5 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin new file mode 100644 index 0000000000..91382db9c4 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin new file mode 100644 index 0000000000..945dfc0ba9 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin new file mode 100644 index 0000000000..31f63fd1fb Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin new file mode 100644 index 0000000000..53c4db55f2 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin new file mode 100644 index 0000000000..e321e7d77d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin new file mode 100644 index 0000000000..4e444b7cc0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin new file mode 100644 index 0000000000..7d5c5303b8 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin new file mode 100644 index 0000000000..e2ffb002af Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin new file mode 100644 index 0000000000..cf95d44875 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin new file mode 100644 index 0000000000..6b0b1fb27d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin new file mode 100644 index 0000000000..a219ab66dd Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin new file mode 100644 index 0000000000..4444fb6236 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin new file mode 100644 index 0000000000..46bcc26f13 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin new file mode 100644 index 0000000000..124776f9d7 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin new file mode 100644 index 0000000000..1dea2c16c0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin new file mode 100644 index 0000000000..086e080224 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin new file mode 100644 index 0000000000..92dfdaad6c Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin new file mode 100644 index 0000000000..d386a76f1a Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin new file mode 100644 index 0000000000..7337dc7cfb Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin new file mode 100644 index 0000000000..7929cb4129 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin new file mode 100644 index 0000000000..4422f29a62 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin new file mode 100644 index 0000000000..ac9ed179f2 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin new file mode 100644 index 0000000000..fc7cca7d07 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin new file mode 100644 index 0000000000..6b47a9aeb4 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin new file mode 100644 index 0000000000..5a1ed0d740 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin new file mode 100644 index 0000000000..e534174651 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin new file mode 100644 index 0000000000..511e260744 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin new file mode 100644 index 0000000000..60ea8a2b08 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin new file mode 100644 index 0000000000..19897811d0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin new file mode 100644 index 0000000000..f4ef9df794 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin new file mode 100644 index 0000000000..ba1c332e14 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin new file mode 100644 index 0000000000..a7be10e143 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin new file mode 100644 index 0000000000..d3281b1336 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin new file mode 100644 index 0000000000..664eb736a7 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin new file mode 100644 index 0000000000..5cf664eb27 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin new file mode 100644 index 0000000000..e8aa03af9b Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin new file mode 100644 index 0000000000..bf3ca9ed4b Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin new file mode 100644 index 0000000000..03665c1edc Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin new file mode 100644 index 0000000000..7f7447a821 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin new file mode 100644 index 0000000000..f1f5cde63c Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin new file mode 100644 index 0000000000..4b1c2f05fb Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin new file mode 100644 index 0000000000..44d9d1c993 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin new file mode 100644 index 0000000000..f1c297a91d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin new file mode 100644 index 0000000000..93434b42c9 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin new file mode 100644 index 0000000000..8d3f9b81e8 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin new file mode 100644 index 0000000000..503c1a4664 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin new file mode 100644 index 0000000000..edafc2d185 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin new file mode 100644 index 0000000000..ce9cb8c434 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin new file mode 100644 index 0000000000..ca66b1ec4c Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin new file mode 100644 index 0000000000..7aebb46299 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin new file mode 100644 index 0000000000..8d3275df41 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin new file mode 100644 index 0000000000..3e85997f2d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin new file mode 100644 index 0000000000..c498f8fd08 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin new file mode 100644 index 0000000000..70730db7e1 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin new file mode 100644 index 0000000000..2f8dac670b Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin new file mode 100644 index 0000000000..db8518e064 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin new file mode 100644 index 0000000000..ecf01a8b31 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin new file mode 100644 index 0000000000..fec8c62c16 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin new file mode 100644 index 0000000000..210976a005 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin new file mode 100644 index 0000000000..cfdf49b4c2 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin new file mode 100644 index 0000000000..f44d7cbbc0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin new file mode 100644 index 0000000000..34e6f73ab5 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin new file mode 100644 index 0000000000..432068d921 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin new file mode 100644 index 0000000000..3b209f1be2 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin new file mode 100644 index 0000000000..31f63fd1fb Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin new file mode 100644 index 0000000000..52cddb5e93 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin new file mode 100644 index 0000000000..e321e7d77d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin new file mode 100644 index 0000000000..4e444b7cc0 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin new file mode 100644 index 0000000000..a8d57c6acd Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin new file mode 100644 index 0000000000..1c8bc45769 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin new file mode 100644 index 0000000000..e2ffb002af Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin new file mode 100644 index 0000000000..cf95d44875 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin new file mode 100644 index 0000000000..6b0b1fb27d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin new file mode 100644 index 0000000000..2bc3aeb18d Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin new file mode 100644 index 0000000000..b035f7f074 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin new file mode 100644 index 0000000000..a804c5e655 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin new file mode 100644 index 0000000000..e7ae61f176 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin new file mode 100644 index 0000000000..426f97426f Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin new file mode 100644 index 0000000000..086e080224 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin new file mode 100644 index 0000000000..399a9ea220 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin new file mode 100644 index 0000000000..25cb14e173 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin differ diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin new file mode 100644 index 0000000000..7337dc7cfb Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin differ 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) @@ -2002,13 +2015,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(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("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(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(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" -- cgit v1.2.3