Cleanup mess in public type ids.
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>
Fri, 13 Jan 2012 09:41:02 +0000 (10:41 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Jan 2012 20:08:08 +0000 (21:08 +0100)
commitaee1f6cc413f56bf4962324799ee3887c3dd037f
treec0be4eb34dc8fc64a050f8943cbf9d9e1007f0b2
parent4df34f055a152657b30d64128dacc82c075cbd74
Cleanup mess in public type ids.

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 <joao.abecasis@nokia.com>
136 files changed:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qmetatype.h
src/corelib/kernel/qmetatype_p.h
src/corelib/kernel/qvariant.cpp
tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
tests/auto/corelib/kernel/qvariant/qvariant.pro
tests/auto/corelib/kernel/qvariant/qvariant.qrc [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/bool.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/char.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/double.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/float.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/int.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/long.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitarray.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbitmap.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbrush.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qbytearray.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qchar.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcolor.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qcursor.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdate.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qdatetime.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qeasingcurve.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qfont.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qicon.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qimage.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qkeysequence.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qline.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlinef.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlocale.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qlonglong.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qmatrix4x4.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpalette.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpen.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpixmap.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpoint.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpointf.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qpolygon.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qquaternion.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrect.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qrectf.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregexp.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qregion.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsize.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizef.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qsizepolicy.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstring.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qstringlist.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextformat.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtextlength.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtime.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qtransform.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qulonglong.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qurl.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariant.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvarianthash.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantlist.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvariantmap.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector2d.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector3d.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/qvector4d.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/short.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/uchar.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/uint.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/ulong.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/ushort.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt4.9/void.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/bool.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/char.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/double.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/float.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/int.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/long.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitarray.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbrush.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbytearray.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qchar.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcolor.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qline.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlinef.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlocale.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qlonglong.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpoint.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpointf.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrect.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qrectf.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregexp.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsize.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizef.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qsizepolicy.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstring.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qstringlist.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtime.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qulonglong.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qurl.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/quuid.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvarianthash.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantlist.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariantmap.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/short.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/uchar.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/uint.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/ulong.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/ushort.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/stream/qt5.0/void.bin [new file with mode: 0644]
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp