From 8df298665a1e637ab6d26d5fcc447d5502afe31a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 15 May 2012 15:40:58 +0200 Subject: Move QIcon metatype handlers back to QtGui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QIcon has been moved back from QWidget to QtGui, so the QIcon QVariant and QMetaType handler can now be moved back to QtGui. Also we can give back QIcon its old number, allowing to get rid of some compatibility hack when unstreaming QVariant Change-Id: I439d5c2987c06ecd619f394407850f678164afb8 Reviewed-by: Lars Knoll Reviewed-by: Jędrzej Nowacki --- .../corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin | Bin 27 -> 27 bytes .../corelib/kernel/qvariant/stream/qt5.0/qcursor.bin | Bin 25 -> 25 bytes .../corelib/kernel/qvariant/stream/qt5.0/qdate.bin | Bin 23 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qdatetime.bin | Bin 36 -> 40 bytes .../kernel/qvariant/stream/qt5.0/qeasingcurve.bin | Bin 43 -> 43 bytes .../corelib/kernel/qvariant/stream/qt5.0/qfont.bin | Bin 89 -> 71 bytes .../corelib/kernel/qvariant/stream/qt5.0/qicon.bin | Bin 23 -> 23 bytes .../corelib/kernel/qvariant/stream/qt5.0/qimage.bin | Bin 25 -> 25 bytes .../kernel/qvariant/stream/qt5.0/qkeysequence.bin | Bin 41 -> 41 bytes .../corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin | Bin 71 -> 71 bytes .../kernel/qvariant/stream/qt5.0/qmatrix4x4.bin | Bin 157 -> 157 bytes .../corelib/kernel/qvariant/stream/qt5.0/qpalette.bin | Bin 5065 -> 5065 bytes .../corelib/kernel/qvariant/stream/qt5.0/qpen.bin | Bin 132 -> 132 bytes .../corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin | Bin 29 -> 29 bytes .../kernel/qvariant/stream/qt5.0/qpolygonf.bin | Bin 31 -> 31 bytes .../kernel/qvariant/stream/qt5.0/qquaternion.bin | Bin 63 -> 63 bytes .../corelib/kernel/qvariant/stream/qt5.0/qregion.bin | Bin 27 -> 27 bytes .../kernel/qvariant/stream/qt5.0/qtextformat.bin | Bin 39 -> 39 bytes .../kernel/qvariant/stream/qt5.0/qtextlength.bin | Bin 43 -> 43 bytes .../kernel/qvariant/stream/qt5.0/qtransform.bin | Bin 101 -> 101 bytes .../corelib/kernel/qvariant/stream/qt5.0/qvariant.bin | Bin 34 -> 30 bytes .../kernel/qvariant/stream/qt5.0/qvector2d.bin | Bin 43 -> 43 bytes .../kernel/qvariant/stream/qt5.0/qvector3d.bin | Bin 51 -> 51 bytes .../kernel/qvariant/stream/qt5.0/qvector4d.bin | Bin 59 -> 59 bytes 24 files changed, 0 insertions(+), 0 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin index 511e260744..13f4dc374d 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.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 index a7be10e143..545fa96a1f 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin 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 index d3281b1336..cc8f894b25 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin 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 index 664eb736a7..ee3da63a18 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin 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 index 5cf664eb27..b3fce0db6d 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin 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 index e8aa03af9b..ce31032451 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin 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 index bf3ca9ed4b..2f8713244c 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin 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 index 03665c1edc..0ab1cbf6fa 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin 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 index 7f7447a821..ec82cc2871 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.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 index 93434b42c9..24bf570968 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin 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 index 8d3f9b81e8..e4fc8054f9 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin 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 index 503c1a4664..b3caa096cb 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin 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 index edafc2d185..964eaa4ee2 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.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 index 8d3275df41..fbdab8fffc 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin 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 index 3e85997f2d..c4b5f652b3 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin 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 index c498f8fd08..558767a6b4 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.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 index ecf01a8b31..27eec8c4d5 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.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 index 432068d921..0d91130d62 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin 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 index 3b209f1be2..640abfba00 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.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 index 52cddb5e93..86a7aaf1ed 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.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 index 1c8bc45769..18267d24f5 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.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 index 2bc3aeb18d..9fe7d9f936 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin 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 index b035f7f074..b3c502f546 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin 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 index a804c5e655..2db479c9ce 100644 Binary files a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin and b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin differ -- cgit v1.2.3