diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-05-15 15:40:58 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 21:42:58 +0200 |
| commit | 8df298665a1e637ab6d26d5fcc447d5502afe31a (patch) | |
| tree | 9d36f54835b70b04bd6ae0bc72aee2a8ea659143 /tests/auto | |
| parent | 6c06e14a49773ce5572935864ed6b9be219c6103 (diff) | |
Move QIcon metatype handlers back to QtGui
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 <lars.knoll@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto')
24 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin Binary files differindex 511e260744..13f4dc374d 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qbitmap.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin Binary files differindex a7be10e143..545fa96a1f 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qcursor.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin Binary files differindex d3281b1336..cc8f894b25 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdate.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin Binary files differindex 664eb736a7..ee3da63a18 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qdatetime.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin Binary files differindex 5cf664eb27..b3fce0db6d 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qeasingcurve.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin Binary files differindex e8aa03af9b..ce31032451 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qfont.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin Binary files differindex bf3ca9ed4b..2f8713244c 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qicon.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin Binary files differindex 03665c1edc..0ab1cbf6fa 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qimage.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin Binary files differindex 7f7447a821..ec82cc2871 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qkeysequence.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin Binary files differindex 93434b42c9..24bf570968 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin Binary files differindex 8d3f9b81e8..e4fc8054f9 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qmatrix4x4.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin Binary files differindex 503c1a4664..b3caa096cb 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpalette.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin Binary files differindex edafc2d185..964eaa4ee2 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpen.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin Binary files differindex 8d3275df41..fbdab8fffc 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygon.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin Binary files differindex 3e85997f2d..c4b5f652b3 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qpolygonf.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin Binary files differindex c498f8fd08..558767a6b4 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qquaternion.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin Binary files differindex ecf01a8b31..27eec8c4d5 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qregion.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin Binary files differindex 432068d921..0d91130d62 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextformat.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin Binary files differindex 3b209f1be2..640abfba00 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtextlength.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin Binary files differindex 52cddb5e93..86a7aaf1ed 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qtransform.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin Binary files differindex 1c8bc45769..18267d24f5 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvariant.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin Binary files differindex 2bc3aeb18d..9fe7d9f936 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector2d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin Binary files differindex b035f7f074..b3c502f546 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector3d.bin diff --git a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin Binary files differindex a804c5e655..2db479c9ce 100644 --- a/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin +++ b/tests/auto/corelib/kernel/qvariant/stream/qt5.0/qvector4d.bin |