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 --- .../auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin | Bin 0 -> 27 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin (limited to 'tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin') diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin new file mode 100644 index 0000000000..ce9cb8c434 Binary files /dev/null and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpixmap.bin differ -- cgit v1.2.3