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: [PATCH] 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 --- src/corelib/io/qdatastream.cpp | 2 +- src/corelib/io/qdatastream.h | 2 +- src/corelib/kernel/qmetatype.cpp | 9 +- src/corelib/kernel/qmetatype.h | 27 ++-- src/corelib/kernel/qmetatype_p.h | 2 - src/corelib/kernel/qvariant.cpp | 73 ++++++--- .../io/qdatastream/tst_qdatastream.cpp | 3 +- .../auto/corelib/kernel/qvariant/qvariant.pro | 1 + .../auto/corelib/kernel/qvariant/qvariant.qrc | 6 + .../kernel/qvariant/stream/qt4.9/bool.bin | Bin 0 -> 18 bytes .../kernel/qvariant/stream/qt4.9/char.bin | Bin 0 -> 18 bytes .../kernel/qvariant/stream/qt4.9/double.bin | Bin 0 -> 29 bytes .../kernel/qvariant/stream/qt4.9/float.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/int.bin | Bin 0 -> 19 bytes .../kernel/qvariant/stream/qt4.9/long.bin | Bin 0 -> 25 bytes .../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 .../qvariant/stream/qt4.9/qbytearray.bin | Bin 0 -> 33 bytes .../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 .../kernel/qvariant/stream/qt4.9/qdate.bin | Bin 0 -> 23 bytes .../qvariant/stream/qt4.9/qdatetime.bin | Bin 0 -> 36 bytes .../qvariant/stream/qt4.9/qeasingcurve.bin | Bin 0 -> 43 bytes .../kernel/qvariant/stream/qt4.9/qfont.bin | Bin 0 -> 73 bytes .../kernel/qvariant/stream/qt4.9/qicon.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt4.9/qimage.bin | Bin 0 -> 25 bytes .../qvariant/stream/qt4.9/qkeysequence.bin | Bin 0 -> 41 bytes .../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 .../qvariant/stream/qt4.9/qlonglong.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qmatrix.bin | Bin 0 -> 71 bytes .../qvariant/stream/qt4.9/qmatrix4x4.bin | Bin 0 -> 157 bytes .../kernel/qvariant/stream/qt4.9/qpalette.bin | Bin 0 -> 5065 bytes .../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 .../qvariant/stream/qt4.9/qquaternion.bin | Bin 0 -> 63 bytes .../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 .../kernel/qvariant/stream/qt4.9/qsize.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/qsizef.bin | Bin 0 -> 37 bytes .../qvariant/stream/qt4.9/qsizepolicy.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt4.9/qstring.bin | Bin 0 -> 27 bytes .../qvariant/stream/qt4.9/qstringlist.bin | Bin 0 -> 35 bytes .../qvariant/stream/qt4.9/qtextformat.bin | Bin 0 -> 39 bytes .../qvariant/stream/qt4.9/qtextlength.bin | Bin 0 -> 43 bytes .../kernel/qvariant/stream/qt4.9/qtime.bin | Bin 0 -> 23 bytes .../qvariant/stream/qt4.9/qtransform.bin | Bin 0 -> 101 bytes .../qvariant/stream/qt4.9/qulonglong.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt4.9/qurl.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt4.9/qvariant.bin | Bin 0 -> 34 bytes .../qvariant/stream/qt4.9/qvarianthash.bin | Bin 0 -> 37 bytes .../qvariant/stream/qt4.9/qvariantlist.bin | Bin 0 -> 37 bytes .../qvariant/stream/qt4.9/qvariantmap.bin | Bin 0 -> 35 bytes .../qvariant/stream/qt4.9/qvector2d.bin | Bin 0 -> 43 bytes .../qvariant/stream/qt4.9/qvector3d.bin | Bin 0 -> 51 bytes .../qvariant/stream/qt4.9/qvector4d.bin | Bin 0 -> 59 bytes .../kernel/qvariant/stream/qt4.9/short.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt4.9/uchar.bin | Bin 0 -> 20 bytes .../kernel/qvariant/stream/qt4.9/uint.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt4.9/ulong.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt4.9/ushort.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt4.9/void.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt5.0/bool.bin | Bin 0 -> 18 bytes .../kernel/qvariant/stream/qt5.0/char.bin | Bin 0 -> 18 bytes .../kernel/qvariant/stream/qt5.0/double.bin | Bin 0 -> 29 bytes .../kernel/qvariant/stream/qt5.0/float.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/int.bin | Bin 0 -> 19 bytes .../kernel/qvariant/stream/qt5.0/long.bin | Bin 0 -> 25 bytes .../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 .../qvariant/stream/qt5.0/qbytearray.bin | Bin 0 -> 33 bytes .../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 .../kernel/qvariant/stream/qt5.0/qdate.bin | Bin 0 -> 23 bytes .../qvariant/stream/qt5.0/qdatetime.bin | Bin 0 -> 36 bytes .../qvariant/stream/qt5.0/qeasingcurve.bin | Bin 0 -> 43 bytes .../kernel/qvariant/stream/qt5.0/qfont.bin | Bin 0 -> 89 bytes .../kernel/qvariant/stream/qt5.0/qicon.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt5.0/qimage.bin | Bin 0 -> 25 bytes .../qvariant/stream/qt5.0/qkeysequence.bin | Bin 0 -> 41 bytes .../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 .../qvariant/stream/qt5.0/qlonglong.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qmatrix.bin | Bin 0 -> 71 bytes .../qvariant/stream/qt5.0/qmatrix4x4.bin | Bin 0 -> 157 bytes .../kernel/qvariant/stream/qt5.0/qpalette.bin | Bin 0 -> 5065 bytes .../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 .../qvariant/stream/qt5.0/qpolygonf.bin | Bin 0 -> 31 bytes .../qvariant/stream/qt5.0/qquaternion.bin | Bin 0 -> 63 bytes .../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 .../kernel/qvariant/stream/qt5.0/qsize.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qsizef.bin | Bin 0 -> 37 bytes .../qvariant/stream/qt5.0/qsizepolicy.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qstring.bin | Bin 0 -> 27 bytes .../qvariant/stream/qt5.0/qstringlist.bin | Bin 0 -> 35 bytes .../qvariant/stream/qt5.0/qtextformat.bin | Bin 0 -> 39 bytes .../qvariant/stream/qt5.0/qtextlength.bin | Bin 0 -> 43 bytes .../kernel/qvariant/stream/qt5.0/qtime.bin | Bin 0 -> 23 bytes .../qvariant/stream/qt5.0/qtransform.bin | Bin 0 -> 101 bytes .../qvariant/stream/qt5.0/qulonglong.bin | Bin 0 -> 37 bytes .../kernel/qvariant/stream/qt5.0/qurl.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt5.0/quuid.bin | Bin 0 -> 35 bytes .../kernel/qvariant/stream/qt5.0/qvariant.bin | Bin 0 -> 34 bytes .../qvariant/stream/qt5.0/qvarianthash.bin | Bin 0 -> 37 bytes .../qvariant/stream/qt5.0/qvariantlist.bin | Bin 0 -> 37 bytes .../qvariant/stream/qt5.0/qvariantmap.bin | Bin 0 -> 35 bytes .../qvariant/stream/qt5.0/qvector2d.bin | Bin 0 -> 43 bytes .../qvariant/stream/qt5.0/qvector3d.bin | Bin 0 -> 51 bytes .../qvariant/stream/qt5.0/qvector4d.bin | Bin 0 -> 59 bytes .../kernel/qvariant/stream/qt5.0/short.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt5.0/uchar.bin | Bin 0 -> 20 bytes .../kernel/qvariant/stream/qt5.0/uint.bin | Bin 0 -> 21 bytes .../kernel/qvariant/stream/qt5.0/ulong.bin | Bin 0 -> 27 bytes .../kernel/qvariant/stream/qt5.0/ushort.bin | Bin 0 -> 23 bytes .../kernel/qvariant/stream/qt5.0/void.bin | Bin 0 -> 21 bytes .../corelib/kernel/qvariant/tst_qvariant.cpp | 138 +++++++++++++++++- .../kernel/qmetatype/tst_qmetatype.cpp | 2 - .../corelib/kernel/qvariant/tst_qvariant.cpp | 2 - 136 files changed, 212 insertions(+), 55 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 diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 5dad9bd9f9f..614910a9d68 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -250,7 +250,7 @@ QT_BEGIN_NAMESPACE return retVal; enum { - DefaultStreamVersion = QDataStream::Qt_4_6 + DefaultStreamVersion = QDataStream::Qt_5_0 }; // ### 5.0: when streaming invalid QVariants, just the type should diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index ca10304b301..818e3044d1d 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -87,7 +87,7 @@ public: Qt_4_7 = Qt_4_6, Qt_4_8 = Qt_4_7, Qt_4_9 = Qt_4_8, - Qt_5_0 = Qt_4_8 + Qt_5_0 = 13 #if QT_VERSION >= 0x050100 #error Add the datastream version for this Qt version #endif diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 1c106f4f368..e5fd8a5d247 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -228,14 +228,13 @@ template<> struct TypeDefiniton { static const bool IsAvailable = false \value User Base value for user types - \omitvalue FirstCoreExtType \omitvalue FirstGuiType \omitvalue FirstWidgetsType - \omitvalue LastCoreExtType \omitvalue LastCoreType \omitvalue LastGuiType \omitvalue LastWidgetsType \omitvalue QReal + \omitvalue HighestInternalId Additional types can be registered using Q_DECLARE_METATYPE(). @@ -362,10 +361,10 @@ const char *QMetaType::typeName(int type) // In theory it can be filled during compilation time, but for some reason template code // that is able to do it causes GCC 4.6 to generate additional 3K of executable code. Probably // it is not worth of it. - static const char *namesCache[QMetaType::LastCoreExtType + 1]; + static const char *namesCache[QMetaType::HighestInternalId + 1]; const char *result; - if (type <= QMetaType::LastCoreExtType && ((result = namesCache[type]))) + if (type <= QMetaType::HighestInternalId && ((result = namesCache[type]))) return result; #define QT_METATYPE_TYPEID_TYPENAME_CONVERTER(MetaTypeName, TypeId, RealName) \ @@ -388,7 +387,7 @@ const char *QMetaType::typeName(int type) } #undef QT_METATYPE_TYPEID_TYPENAME_CONVERTER - Q_ASSERT(type <= QMetaType::LastCoreExtType); + Q_ASSERT(type <= QMetaType::HighestInternalId); namesCache[type] = result; return result; } diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 5a55ca9bd7b..bbe482428f5 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -65,16 +65,16 @@ QT_BEGIN_NAMESPACE F(LongLong, 4, qlonglong) \ F(ULongLong, 5, qulonglong) \ F(Double, 6, double) \ - F(Long, 129, long) \ - F(Short, 130, short) \ - F(Char, 131, char) \ - F(ULong, 132, ulong) \ - F(UShort, 133, ushort) \ - F(UChar, 134, uchar) \ - F(Float, 135, float) \ + F(Long, 32, long) \ + F(Short, 33, short) \ + F(Char, 34, char) \ + F(ULong, 35, ulong) \ + F(UShort, 36, ushort) \ + F(UChar, 37, uchar) \ + F(Float, 38, float) \ #define QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(F)\ - F(VoidStar, 128, void*) \ + F(VoidStar, 31, void*) \ #define QT_FOR_EACH_STATIC_CORE_CLASS(F)\ F(QChar, 7, QChar) \ @@ -98,12 +98,12 @@ QT_BEGIN_NAMESPACE F(QRegExp, 27, QRegExp) \ F(QEasingCurve, 29, QEasingCurve) \ F(QUuid, 30, QUuid) \ - F(QModelIndex, 31, QModelIndex) \ - F(QVariant, 138, QVariant) \ + F(QVariant, 41, QVariant) \ + F(QModelIndex, 42, QModelIndex) \ #define QT_FOR_EACH_STATIC_CORE_POINTER(F)\ - F(QObjectStar, 136, QObject*) \ - F(QWidgetStar, 137, QWidget*) \ + F(QObjectStar, 39, QObject*) \ + F(QWidgetStar, 40, QWidget*) \ #define QT_FOR_EACH_STATIC_CORE_TEMPLATE(F)\ F(QVariantMap, 8, QVariantMap) \ @@ -188,8 +188,7 @@ public: LastGuiType = QPolygonF, FirstWidgetsType = QIcon, LastWidgetsType = QSizePolicy, - FirstCoreExtType = VoidStar, - LastCoreExtType = QVariant, + HighestInternalId = LastWidgetsType, // This logic must match the one in qglobal.h #if defined(QT_COORD_TYPE) diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index e7a7ed80198..45768bb3b96 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -68,8 +68,6 @@ static inline int moduleForType(const int typeId) return Gui; if (typeId <= QMetaType::LastWidgetsType) return Widgets; - if (typeId <= QMetaType::LastCoreExtType) - return Core; return Unknown; } } diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index e0d1114622d..c14e6ffd17a 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1625,7 +1625,7 @@ QVariant::Type QVariant::nameToType(const char *name) #ifndef QT_NO_DATASTREAM enum { MapFromThreeCount = 36 }; -static const ushort map_from_three[MapFromThreeCount] = +static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] = { QVariant::Invalid, QVariant::Map, @@ -1675,26 +1675,45 @@ void QVariant::load(QDataStream &s) { clear(); - quint32 u; - s >> u; + quint32 typeId; + s >> typeId; if (s.version() < QDataStream::Qt_4_0) { - if (u >= MapFromThreeCount) + if (typeId >= MapFromThreeCount) return; - u = map_from_three[u]; + typeId = mapIdFromQt3ToCurrent[typeId]; + } else if (s.version() < QDataStream::Qt_5_0) { + if (typeId >= 128 && typeId != QVariant::UserType) { + // In Qt4 id == 128 was FirstExtCoreType. In Qt5 ExtCoreTypes set was merged to CoreTypes + // by moving all ids down by 97. + typeId -= 97; + } else if (typeId == 69 /* QIcon */) { + // In Qt5 after modularization project this types where moved to a separate module (and ids were downgraded) + typeId = QMetaType::QIcon; + } else if (typeId == 75 /* QSizePolicy */) { + typeId = QMetaType::QSizePolicy; + } else if (typeId >= 70) { + // and as a result this types recieved lower ids too + if (typeId <= 74) { // QImage QPolygon QRegion QBitmap QCursor + typeId -=1; + } else if (typeId <= 86) { // QKeySequence QPen QTextLength QTextFormat QMatrix QTransform QMatrix4x4 QVector2D QVector3D QVector4D QQuaternion + typeId -=2; + } + } } + qint8 is_null = false; if (s.version() >= QDataStream::Qt_4_2) s >> is_null; - if (u == QVariant::UserType) { + if (typeId == QVariant::UserType) { QByteArray name; s >> name; - u = QMetaType::type(name); - if (!u) { + typeId = QMetaType::type(name); + if (!typeId) { s.setStatus(QDataStream::ReadCorruptData); return; } } - create(static_cast(u), 0); + create(static_cast(typeId), 0); d.is_null = is_null; if (!isValid()) { @@ -1720,12 +1739,12 @@ void QVariant::load(QDataStream &s) */ void QVariant::save(QDataStream &s) const { - quint32 tp = type(); + quint32 typeId = type(); if (s.version() < QDataStream::Qt_4_0) { int i; for (i = MapFromThreeCount - 1; i >= 0; i--) { - if (map_from_three[i] == tp) { - tp = i; + if (mapIdFromQt3ToCurrent[i] == typeId) { + typeId = i; break; } } @@ -1733,11 +1752,29 @@ void QVariant::save(QDataStream &s) const s << QVariant(); return; } + } else if (s.version() < QDataStream::Qt_5_0) { + if (typeId >= 128 - 97 && typeId <= LastCoreType) { + // In Qt4 id == 128 was FirstExtCoreType. In Qt5 ExtCoreTypes set was merged to CoreTypes + // by moving all ids down by 97. + typeId += 97; + } else if (typeId == QMetaType::QIcon) { + // In Qt5 after modularization project this types where moved to a separate module (and ids were downgraded) + typeId = 69; + } else if (typeId == QMetaType::QSizePolicy) { + typeId = 75; + } else if (typeId >= QMetaType::QImage) { + // and as a result this types recieved lower ids too + if (typeId <= QMetaType::QCursor) { + typeId +=1; + } else if (typeId <= QMetaType::QQuaternion) { + typeId +=2; + } + } } - s << tp; + s << typeId; if (s.version() >= QDataStream::Qt_4_2) s << qint8(d.is_null); - if (tp == QVariant::UserType) { + if (typeId == QVariant::UserType) { s << QMetaType::typeName(userType()); } @@ -2411,17 +2448,15 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] = */ bool QVariant::canConvert(Type t) const { - //we can treat floats as double - //the reason for not doing it the "proper" way is that QMetaType::Float's value is 135, - //which can't be handled by qCanConvertMatrix - //In addition QVariant::Type doesn't have a Float value, so we're using QMetaType::Float + // TODO Reimplement this function, currently it works but it is a historical mess. const uint currentType = ((d.type == QMetaType::Float) ? QVariant::Double : d.type); if (uint(t) == uint(QMetaType::Float)) t = QVariant::Double; if (currentType == uint(t)) return true; - if (currentType > QVariant::LastCoreType || t > QVariant::LastCoreType) { + // FIXME It should be LastCoreType intead of Uuid + if (currentType > QVariant::Uuid || t > QVariant::Uuid) { switch (uint(t)) { case QVariant::Int: return currentType == QVariant::KeySequence diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index 4f39af93ed0..6aff1435587 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -255,7 +255,8 @@ static int NColorRoles[] = { QPalette::ToolTipText + 1, // Qt_4_4 QPalette::ToolTipText + 1, // Qt_4_5 QPalette::ToolTipText + 1, // Qt_4_6 - 0 // add the correct value for Qt_4_7 here later + QPalette::ToolTipText + 1, // Qt_5_0 + 0 // add the correct value for Qt_5_1 here later }; // Testing get/set functions diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 93877a1059f..48229ee140b 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 00000000000..e6f7bdac809 --- /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 0000000000000000000000000000000000000000..7929cb41298624bcc30678631ce224d452a71885 GIT binary patch literal 18 XcmZQzVBla#V#o)=90mpkMn(nz5h($; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c15cb78507df18b4005f04cff6fc97b62a2d2f1 GIT binary patch literal 18 ZcmZQzVBla#X2@VjWGG@_U}$Fi000vU0~-JU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ac9ed179f2a2819fc3d43669764907c90131cd8b GIT binary patch literal 29 fcmZQzVBld$VaR7FWk_PkVMt|QU|?ee5?}xTFwz2# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..540c010dc979c27c74757c9ff181f2873e4e093d GIT binary patch literal 27 dcmZQzVBlg%W5{91XGmlyVPIfrX9N;p001k*0;vE1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6b47a9aeb4e00fcebf12f374af1791ed4a83cf44 GIT binary patch literal 19 YcmZQzU|?g&WXNMEVPIfjVgwQl01xs3RR910 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..66891d5ed8bb9fda01a827af6c0951d34317f179 GIT binary patch literal 25 fcmZQzVBlcLVaR95V@PLUU}$9g4+PsRH-7*CLR$#Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e5341746515995f4f9f3733d168fa751e0a5fb7d GIT binary patch literal 31 jcmZQzU=U&mWN>20WGG>9WGDi{M21QR1_oY6Ai)3tJ{|** literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..13f4dc374ddec99899906dd6e17e41b7829a86fe GIT binary patch literal 27 gcmZQzVBlj2WN>20WGG?CWk_TwU|?YIWCRin04&G@2LJ#7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..60ea8a2b08924f4a722582471a98c811dcaae43f GIT binary patch literal 105 rcmZQzVBld0WN>0AVkl)OX2@V*U~pn&VEq3d$N&TT4=@&Xnpk-NCOQZ) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..19897811d015b0bdae54db269c8c96dd42cc0379 GIT binary patch literal 33 kcmZQzU=U#lWN>1rWGG=sWpHFD0>VTfkAZ=Q@jnm%093RH0ssI2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f4ef9df7946c0ce888eee0b0a32adb34f54d324b GIT binary patch literal 21 ccmZQzVBlg1WN>E4U`S*rVqjokXJlXi02SN;;s5{u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ba1c332e149739f4155699dcdc346e18ec289a67 GIT binary patch literal 32 hcmZQzVBld0WN>E4XUGBKA_fKqXGVtq|A90Z002pr1fKu^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..545fa96a1f3799e100e926a5e6de98ddf98943fc GIT binary patch literal 25 ecmZQzVBlj2WN>CEWhi1OX2=JU3=Ce33=9A$SOX~l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3281b13363107e50c8beb7f10d1b1c976039f54 GIT binary patch literal 23 ccmZQzVBlg1WN=|fWGG=sWnf_7V+0Zm02$f==>Px# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..664eb736a732ac417c982c8782258ba2b5d3854d GIT binary patch literal 36 mcmZQzU=U&mWN=|fWGG=sWe8!&WXJ{53=9H{K!V{v2mk9jWGH6HWXNMkXK-dHWhi1OV@PFSV31`55)2I6Y6VU(004+K2JZj> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..76bc5d932fc454e90771eb83e46ee3fbd8905bbf GIT binary patch literal 73 zcmZQzVBlg1WN>51XUJnHVPIfzU<49k3@!|*3|S0`3}FnV3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2f8713244c13fdcfa9147e3a0759c1b0078b7f2d GIT binary patch literal 23 ccmZQzVBlg1WbkB2X2@sAV_;x#W&95W041abCjbBd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0ab1cbf6fa36e858d5147b69af6bb567cbbc5626 GIT binary patch literal 25 ecmZQzVBld0WbkCjWk_U5XGmpWU~ppu5)1$%Bm#&4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..03db168e93b3b8d43fffb4943e135e7b9aaa228b GIT binary patch literal 41 ocmZQzV31%4WbkH4WvFBb29kvgr9d)|AsI+AF!(S62@qxg0D3tE8UO$Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1f5cde63cea0a3bcf8d1125ef47f0b27a5e2f61 GIT binary patch literal 35 dcmZQzVBlg1Wbk3gWXNMkWnf?sX9N-`001(G0sH^} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b1c2f05fbe902d5f1fd0125bfeead1ad8da311c GIT binary patch literal 53 fcmZQzVBld0Wbk3gWXNMkWpHC)V31%05_kasVEO_@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..44d9d1c993f57f8e4ad1620749ff375845337129 GIT binary patch literal 37 pcmZQzVBlj2Wbk3gXGms9WXNGiWnf?sVgwRgKxQ68JVPi$FaS{41g8K1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1c297a91de0120aea23a96a7100b4d3c7c924be GIT binary patch literal 35 dcmZQzU=U&`WXNI2XUJnnhtmuUEQ}0L0036f1L*(& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fc88e2564a2ddebba85da80690eb700e17a4817e GIT binary patch literal 71 lcmZQzVBlj2WbkE3WGG=MV#s8uU|?VfV6^`Lq_6;7;s6XI1%vl?R#G+&p1IX(Fj8V?`pn%RDK(&idL>Y51) zA8N+Ye=r#Q?mThg%9UNasO!!}i`K87GKIQk8tpf`s24+BGb<~XEZMMux@OWQ-owM! zt)s3xYio0ICQP8NnHMhHxpU|c^~_|TQJFk->Xt2s4^z*bw5mHIMdNk{t5MgTQ{FG= z?Vz&XFSXsjd8CTE?%X}?c-eX(>Y5qyD=OOGpSosFRGt;oUQAsxqb=fl!tAJPCN0XP z@QOH}fFSC+^L+cwlp|);HFMpPotqZ@rLLK#ffgGLsaV#5$`D$(lNM!2Oig|NjH%QO z&wh^Xwn@vVYv#3?4>C@NQP0egULPsOD;LUBxjt%{IN^J_IrZWQ+&?nDY`lewx@NAo z+%s>%De9W(_ax+v2eA7|&3;FF!NgNF9@I5cEnUN2#h$um(xN_+&6A%lElFK>9*e(t zaVINv&0M6ku6@dJ>Y8b^&a6+biMnRinJ>%T5I|isrMDTps}dDV_N! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1eff5c83adb09a42230e3e0e9e2783e228dd55f3 GIT binary patch literal 132 scmZQzVBlZ~WC&nLWyoV-VDM!Ga$taw@&A7q+x`QLg`Fl=-T{kt0HS3F=>Px# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ce9cb8c434669786cf4e88d6fd3cf66707190200 GIT binary patch literal 27 gcmZQzVBlj2WC&o$WT;@sWk_TwU|?WyWCRin04?wX5dZ)H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ca66b1ec4c713b97d2d8429a05556a053b16b864 GIT binary patch literal 29 fcmZQzVBld0WC&o$XUJs8V<=%@V31@45?}xTE*1iU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7aebb462997007dedc45079d9730dbb05a86f500 GIT binary patch literal 39 hcmZQzVBlj2WC&o$XUJs8V<=&8V_;yAVgwQ>002!?0?PmZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fbdab8fffc1426c35960d4ac14c42ac7a38ac1ad GIT binary patch literal 29 hcmZQzU=UykWC&o$XUJiwWJm|nc?=8;?u|F85sN-{{sP#!2keVn}4jV<=`wW5@@xa~T*I0vYW;04Y3xSa|>mt_T4D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e321e7d77db1ee02d787bc3ca867b4be0dfac57e GIT binary patch literal 37 fcmZQzU=U#_WGH3GVaR95V@QY73=FJ{3{U_7W!?l~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e444b7cc064e761e8fa6ef7ea14f8938f72127a GIT binary patch literal 21 acmZQzVBlZ~WC&#_V#r}&U=U>d4+H=nOa+?& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7d5c5303b8774b9390b0a70fc1b25e05a8de1210 GIT binary patch literal 34 lcmZQzU=UykWC&wOWGG_D1d@3SB@7G=M9001E71-JkJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7929cb41298624bcc30678631ce224d452a71885 GIT binary patch literal 18 XcmZQzVBla#V#o)=90mpkMn(nz5h($; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4422f29a627827d2763df151df6751523e66b8f0 GIT binary patch literal 18 ZcmZQzVBla#X2@VjWGG@_U{GRY000p90m=XX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ac9ed179f2a2819fc3d43669764907c90131cd8b GIT binary patch literal 29 fcmZQzVBld$VaR7FWk_PkVMt|QU|?ee5?}xTFwz2# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fc7cca7d07db105eb0702c5e4c1ca15039aab932 GIT binary patch literal 27 dcmZQzVBlg%W5{91XGmlyVPIfTV+0al001ZY0!RP= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6b47a9aeb4e00fcebf12f374af1791ed4a83cf44 GIT binary patch literal 19 YcmZQzU|?g&WXNMEVPIfjVgwQl01xs3RR910 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5a1ed0d7403dd4b1e953acad50e50443dc546a6a GIT binary patch literal 25 bcmZQzVBlcLVaR95V@PLUU{GKL5?}xT9?}8Y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e5341746515995f4f9f3733d168fa751e0a5fb7d GIT binary patch literal 31 jcmZQzU=U&mWN>20WGG>9WGDi{M21QR1_oY6Ai)3tJ{|** literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..511e2607446f20200e01c2142bdfd4db04e80e55 GIT binary patch literal 27 gcmZQzVBlj2WN>20WGG?CWk_TwU|?YIU<48j04%}-1^@s6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..60ea8a2b08924f4a722582471a98c811dcaae43f GIT binary patch literal 105 rcmZQzVBld0WN>0AVkl)OX2@V*U~pn&VEq3d$N&TT4=@&Xnpk-NCOQZ) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..19897811d015b0bdae54db269c8c96dd42cc0379 GIT binary patch literal 33 kcmZQzU=U#lWN>1rWGG=sWpHFD0>VTfkAZ=Q@jnm%093RH0ssI2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f4ef9df7946c0ce888eee0b0a32adb34f54d324b GIT binary patch literal 21 ccmZQzVBlg1WN>E4U`S*rVqjokXJlXi02SN;;s5{u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ba1c332e149739f4155699dcdc346e18ec289a67 GIT binary patch literal 32 hcmZQzVBld0WN>E4XUGBKA_fKqXGVtq|A90Z002pr1fKu^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a7be10e1436faef4146d3afefa8635b59d9368aa GIT binary patch literal 25 ecmZQzVBlj2WN>CEWhi1OX2=JU3=E!(3=9A$R0Ajg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3281b13363107e50c8beb7f10d1b1c976039f54 GIT binary patch literal 23 ccmZQzVBlg1WN=|fWGG=sWnf_7V+0Zm02$f==>Px# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..664eb736a732ac417c982c8782258ba2b5d3854d GIT binary patch literal 36 mcmZQzU=U&mWN=|fWGG=sWe8!&WXJ{53=9H{K!V{v2mk9jWGH6HWXNMkXK-dHWhi1OV@PFSV31`55)2I6;)G5x004);2GRfk literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e8aa03af9bc63dc39c6d03ed20b99f5441f3f69b GIT binary patch literal 89 zcmZQzVBlg1WN>51XUJnHVPIfzU<49s3{DK0KyEP*7crzVBr@bOC@_QpSw%p$0z)v6 a%ws5a&;Y6hg8x9k%E(|Oz>osc4F&*WG7fnF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bf3ca9ed4bb70f43b91f110f3fe5f66c1a903bc1 GIT binary patch literal 23 ccmZQzVBlg1WbkB2X2@sAV_;yYVEhjR04CN3S^xk5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..03665c1edc52b9c13ccb6d7a0adf95b6445e61b0 GIT binary patch literal 25 ecmZQzVBld0WbkCjWk_U5XGmpWU~pvw5)1$%9s-8| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7f7447a8218baf0efc04351dad2fa16a708c003c GIT binary patch literal 41 ocmZQzV31%4WbkH4WvFBb29kvgr9d)|AsI+AFnBQn2@qxg0D2__7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1f5cde63cea0a3bcf8d1125ef47f0b27a5e2f61 GIT binary patch literal 35 dcmZQzVBlg1Wbk3gWXNMkWnf?sX9N-`001(G0sH^} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b1c2f05fbe902d5f1fd0125bfeead1ad8da311c GIT binary patch literal 53 fcmZQzVBld0Wbk3gWXNMkWpHC)V31%05_kasVEO_@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..44d9d1c993f57f8e4ad1620749ff375845337129 GIT binary patch literal 37 pcmZQzVBlj2Wbk3gXGms9WXNGiWnf?sVgwRgKxQ68JVPi$FaS{41g8K1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1c297a91de0120aea23a96a7100b4d3c7c924be GIT binary patch literal 35 dcmZQzU=U&`WXNI2XUJnnhtmuUEQ}0L0036f1L*(& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..93434b42c983e0929476d8b118d480e753803236 GIT binary patch literal 71 lcmZQzVBlj2WbkE3WGG=MV#s8uU|?YIW3>MOq_6;7;s6W31%dzo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d3f9b81e822e5aa8871762192feb34e71358a33 GIT binary patch literal 157 ocmZQzU=U#lWbkE3WGG=MV#s8uU@!q=28IAe`wt960a~d80DhAQ$N&HU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..503c1a46644b9a908937fc73c5c4cc06632d36f5 GIT binary patch literal 5065 zcmZQzU=UykWC&nLWXNGiWheo{R0akH7e+?L|NnsuFtGmsV_~O>l?R!5_wN1sPo6L^ z5UU5fjR^f9Ga&#WMo14Kd0Lqn3I^15=W#Hgu9>j#8SHU1RNVO<3S)C002!?0?PmZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d3275df4157693221c2a0c255507234341297c3 GIT binary patch literal 29 hcmZQzU=UykWC&o$XUJiwWJm|nc?=8;Zj3;J0RTAE1Cam# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3e85997f2de2faeec267dccf1888569803537c97 GIT binary patch literal 31 jcmZQzU=U&mWC&o$XUJiwWJm|nc?@n03=E-+K!O1PLbe0w literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c498f8fd08a90cee0cc1dfdca6beffbd69bafa51 GIT binary patch literal 63 ocmZQzU=U*n1j15=M1~TERE8pkJcdk$d?3ld5W;Bx0Z8Ei015>L5&!@I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..70730db7e1269f5cf440de42a48b44e67c8180ea GIT binary patch literal 35 fcmZQzVBlg1WC&tNWk_ZyVPIeoW&{#o@E-~QR-Os= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2f8dac670b983a9250e3d7f699b6eb85e5a193c1 GIT binary patch literal 53 fcmZQzVBld0WC&tNWk_ZyVQ^z$U=U#h5_kasVPFDB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..db8518e064e288165c016781b8ec6f7d54d0be48 GIT binary patch literal 30 jcmZQzVBlj2WC&tNWk_dmWvE~%U|?X7X8aEXj0_9_NdgAM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ecf01a8b311b5a4bfbfb9de610158b8f2e75e125 GIT binary patch literal 27 gcmZQzVBlj2WC&tNWk_epWXNa8V_;x#X9N-q04+cR3;+NC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fec8c62c16f232da6d2a20e135505e55841abd6b GIT binary patch literal 27 ccmZQzVBlg1WC&)+WT;|DWnf?sW&95X07twE1poj5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..210976a005f778b979cdf11642141179df9e10f6 GIT binary patch literal 37 jcmZQzVBld0WC&)+WT;|DWpHC)U=U;6{{ct=0gMI!Wf%pt literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cfdf49b4c2243eecf613c4564e019e8439938d3e GIT binary patch literal 35 ncmZQzU=U*nWC&)+WT;|DWe8x%XUGAvlNl-*7#J!Ufdm5pTLJ{_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f44d7cbbc07d0d3adc0248d3e5a841efd95a64de GIT binary patch literal 27 gcmZQzVBlj2WC&&`VJKqAWXNMkXJBC9V*C#T05?bm-T(jq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..34e6f73ab5a2bfa86dc8834a2fd941caddb3b321 GIT binary patch literal 35 mcmZQzU=U*nWC&&`VJKqAWXNMkXYc{i#Xvp-12-d(U;qGFdIX06 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..432068d921a27458e9d5ac2ffc5bd3cc4c80a0c4 GIT binary patch literal 39 qcmZQzU=U*nWC&qMWvE~%VQ^!}XDDLGWk>|F85n#S{{sP#!2keVn}4jV<=`wW5@@xa~T*I{2A>(04Y3xSa|>m8VCOX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e321e7d77db1ee02d787bc3ca867b4be0dfac57e GIT binary patch literal 37 fcmZQzU=U#_WGH3GVaR95V@QY73=FJ{3{U_7W!?l~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e444b7cc064e761e8fa6ef7ea14f8938f72127a GIT binary patch literal 21 acmZQzVBlZ~WC&#_V#r}&U=U>d4+H=nOa+?& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a8d57c6acd431b8336d1444095fedebc27555280 GIT binary patch literal 35 dcmZQzVBlg1WC&#_WyoYmVPIg8V+0Z?001t<8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..426f97426ff7e41c2842c143bce7f890f3346118 GIT binary patch literal 20 bcmZQzVBlgXWk_boU`S*rVqjoUWn=&V7!U$P literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..086e0802241ffba15884f1a8485553e18aa79758 GIT binary patch literal 21 acmZQzVBlaVWyoa6V<=%@U|?nh5)1$rdI8M< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..399a9ea220e85767e5af3d61ba6511c7a591076b GIT binary patch literal 27 dcmZQzVBlgXWyoR3XUJnnXJBAZW&{#o001dK0#pD1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..25cb14e173fcf035f8fd374b250f5ef988533441 GIT binary patch literal 23 ecmZQzVBldWWhiFIV8~}EVklu?U{GOXU;qFk`~uei literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7337dc7cfb5142d1a7b30da821fa7dcedc8005c9 GIT binary patch literal 21 ZcmZQzVBlaVW5{R7WJqBE0>=M9001E71-JkJ literal 0 HcmV?d00001 diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index f40b1eae0b7..f88e7951675 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" diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp index 2faacc2372f..558604ea613 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -242,8 +242,6 @@ void tst_QMetaType::constructCoreType_data() QTest::addColumn("typeId"); for (int i = 0; i <= QMetaType::LastCoreType; ++i) QTest::newRow(QMetaType::typeName(i)) << i; - for (int i = QMetaType::FirstCoreExtType; i <= QMetaType::LastCoreExtType; ++i) - QTest::newRow(QMetaType::typeName(i)) << i; // GUI types are tested in tst_QGuiMetaType. } diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp index 8f0a331c807..52999c170c1 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp @@ -307,8 +307,6 @@ void tst_qvariant::createCoreType_data() QTest::addColumn("typeId"); for (int i = 0; i <= QMetaType::LastCoreType; ++i) QTest::newRow(QMetaType::typeName(i)) << i; - for (int i = QMetaType::FirstCoreExtType; i <= QMetaType::LastCoreExtType; ++i) - QTest::newRow(QMetaType::typeName(i)) << i; } // Tests how fast a Qt core type can be default-constructed by a