From 8df298665a1e637ab6d26d5fcc447d5502afe31a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 15 May 2012 15:40:58 +0200 Subject: [PATCH] Move QIcon metatype handlers back to QtGui MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 --- src/corelib/kernel/qmetatype.cpp | 4 +- src/corelib/kernel/qmetatype.h | 49 +++++++++++---------- src/corelib/kernel/qmetatype_p.h | 3 ++ src/corelib/kernel/qvariant.cpp | 23 +++------- src/corelib/kernel/qvariant.h | 2 +- src/gui/kernel/qguivariant.cpp | 16 ++++++- src/widgets/kernel/qwidgetsvariant.cpp | 26 ----------- .../kernel/qvariant/stream/qt5.0/qbitmap.bin | Bin 27 -> 27 bytes .../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 .../kernel/qvariant/stream/qt5.0/qimage.bin | Bin 25 -> 25 bytes .../kernel/qvariant/stream/qt5.0/qkeysequence.bin | Bin 41 -> 41 bytes .../kernel/qvariant/stream/qt5.0/qmatrix.bin | Bin 71 -> 71 bytes .../kernel/qvariant/stream/qt5.0/qmatrix4x4.bin | Bin 157 -> 157 bytes .../kernel/qvariant/stream/qt5.0/qpalette.bin | Bin 5065 -> 5065 bytes .../corelib/kernel/qvariant/stream/qt5.0/qpen.bin | Bin 132 -> 132 bytes .../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 .../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 .../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 31 files changed, 51 insertions(+), 72 deletions(-) diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 48cabeb..e1cebc4 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -845,11 +845,11 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QVector3D: case QMetaType::QVector4D: case QMetaType::QQuaternion: + case QMetaType::QIcon: if (!qMetaTypeGuiHelper) return false; qMetaTypeGuiHelper[type - FirstGuiType].saveOp(stream, data); break; - case QMetaType::QIcon: case QMetaType::QSizePolicy: if (!qMetaTypeWidgetsHelper) return false; @@ -1069,11 +1069,11 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QVector3D: case QMetaType::QVector4D: case QMetaType::QQuaternion: + case QMetaType::QIcon: if (!qMetaTypeGuiHelper) return false; qMetaTypeGuiHelper[type - FirstGuiType].loadOp(stream, data); break; - case QMetaType::QIcon: case QMetaType::QSizePolicy: if (!qMetaTypeWidgetsHelper) return false; diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 33e7fa4..7470254 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -127,26 +127,27 @@ QT_BEGIN_NAMESPACE F(QBrush, 66, QBrush) \ F(QColor, 67, QColor) \ F(QPalette, 68, QPalette) \ - F(QImage, 69, QImage) \ - F(QPolygon, 70, QPolygon) \ - F(QRegion, 71, QRegion) \ - F(QBitmap, 72, QBitmap) \ - F(QCursor, 73, QCursor) \ - F(QKeySequence, 74, QKeySequence) \ - F(QPen, 75, QPen) \ - F(QTextLength, 76, QTextLength) \ - F(QTextFormat, 77, QTextFormat) \ - F(QMatrix, 78, QMatrix) \ - F(QTransform, 79, QTransform) \ - F(QMatrix4x4, 80, QMatrix4x4) \ - F(QVector2D, 81, QVector2D) \ - F(QVector3D, 82, QVector3D) \ - F(QVector4D, 83, QVector4D) \ - F(QQuaternion, 84, QQuaternion) \ - F(QPolygonF, 85, QPolygonF) \ + F(QIcon, 69, QIcon) \ + F(QImage, 70, QImage) \ + F(QPolygon, 71, QPolygon) \ + F(QRegion, 72, QRegion) \ + F(QBitmap, 73, QBitmap) \ + F(QCursor, 74, QCursor) \ + F(QKeySequence, 75, QKeySequence) \ + F(QPen, 76, QPen) \ + F(QTextLength, 77, QTextLength) \ + F(QTextFormat, 78, QTextFormat) \ + F(QMatrix, 79, QMatrix) \ + F(QTransform, 80, QTransform) \ + F(QMatrix4x4, 81, QMatrix4x4) \ + F(QVector2D, 82, QVector2D) \ + F(QVector3D, 83, QVector3D) \ + F(QVector4D, 84, QVector4D) \ + F(QQuaternion, 85, QQuaternion) \ + F(QPolygonF, 86, QPolygonF) \ + #define QT_FOR_EACH_STATIC_WIDGETS_CLASS(F)\ - F(QIcon, 120, QIcon) \ F(QSizePolicy, 121, QSizePolicy) \ // ### FIXME kill that set @@ -208,7 +209,7 @@ public: LastCoreType = SChar, FirstGuiType = QFont, LastGuiType = QPolygonF, - FirstWidgetsType = QIcon, + FirstWidgetsType = QSizePolicy, LastWidgetsType = QSizePolicy, HighestInternalId = LastWidgetsType, @@ -232,11 +233,11 @@ public: QObjectStar = 39, QWidgetStar = 40, QVariantMap = 8, QVariantList = 9, QVariantHash = 28, QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68, - QImage = 69, QPolygon = 70, QRegion = 71, QBitmap = 72, QCursor = 73, - QKeySequence = 74, QPen = 75, QTextLength = 76, QTextFormat = 77, - QMatrix = 78, QTransform = 79, QMatrix4x4 = 80, QVector2D = 81, - QVector3D = 82, QVector4D = 83, QQuaternion = 84, QPolygonF = 85, - QIcon = 120, QSizePolicy = 121, + QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73, + QCursor = 74, QKeySequence = 75, QPen = 76, QTextLength = 77, QTextFormat = 78, + QMatrix = 79, QTransform = 80, QMatrix4x4 = 81, QVector2D = 82, + QVector3D = 83, QVector4D = 84, QQuaternion = 85, QPolygonF = 86, + QSizePolicy = 121, User = 256 }; #endif diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index b593489..cffc45c 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -236,6 +236,9 @@ template<> struct TypeDefinition { static const bool IsAvailable = fa #ifdef QT_NO_QUATERNION template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif +#ifdef QT_NO_ICON +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +#endif } //namespace QtMetaTypePrivate QT_END_NAMESPACE diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index cb50603..3d3183a 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1669,18 +1669,12 @@ void QVariant::load(QDataStream &s) // 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 these 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) { + } else if (typeId > 75 && typeId <= 86) { // and as a result these types received 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; - } + // QKeySequence QPen QTextLength QTextFormat QMatrix QTransform QMatrix4x4 QVector2D QVector3D QVector4D QQuaternion + typeId -=1; } } @@ -1744,18 +1738,11 @@ void QVariant::save(QDataStream &s) const // 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 these 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) { + } else if (typeId >= QMetaType::QKeySequence && typeId <= QMetaType::QQuaternion) { // and as a result these types received lower ids too - if (typeId <= QMetaType::QCursor) { - typeId +=1; - } else if (typeId <= QMetaType::QQuaternion) { - typeId +=2; - } + typeId +=1; } } s << typeId; diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 8ba27d2..15fbfc9 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -184,9 +184,9 @@ class Q_CORE_EXPORT QVariant Vector4D = QMetaType::QVector4D, Quaternion = QMetaType::QQuaternion, PolygonF = QMetaType::QPolygonF, + Icon = QMetaType::QIcon, LastGuiType = QMetaType::LastGuiType, - Icon = QMetaType::QIcon, SizePolicy = QMetaType::QSizePolicy, UserType = QMetaType::User, diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 9d1294d..8a5c083 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -64,6 +64,7 @@ #include "qvector3d.h" #include "qvector4d.h" #include "qquaternion.h" +#include "qicon.h" // Core types #include "qvariant.h" @@ -137,7 +138,7 @@ static bool isNull(const QVariant::Private *d) return QMetaTypeSwitcher::switcher(isNull, d->type, 0); } -// This class is a hack that customizes access to QPixmap, QBitmap and QCursor +// This class is a hack that customizes access to QPixmap, QBitmap, QCursor and QIcon template class QGuiVariantComparator : public QVariantComparator { typedef QVariantComparator Base; @@ -164,6 +165,12 @@ public: return v_cast(Base::m_a)->shape() == v_cast(Base::m_b)->shape(); } #endif +#ifndef QT_NO_ICON + bool delegate(const QIcon *) + { + return false; + } +#endif bool delegate(const void *p) { return Base::delegate(p); } }; @@ -289,6 +296,13 @@ static bool convert(const QVariant::Private *d, int t, } } #endif +#ifndef QT_NO_ICON + case QVariant::Icon: { + if (ok) + *ok = false; + return false; + } +#endif default: break; } diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index 15935a5..e19d955 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -41,7 +41,6 @@ #include "qvariant.h" -#include "qicon.h" #include "qsizepolicy.h" #include "private/qvariant_p.h" @@ -53,11 +52,6 @@ namespace { static void construct(QVariant::Private *x, const void *copy) { switch (x->type) { -#ifndef QT_NO_ICON - case QVariant::Icon: - v_construct(x, copy); - break; -#endif case QVariant::SizePolicy: v_construct(x, copy); break; @@ -72,11 +66,6 @@ static void construct(QVariant::Private *x, const void *copy) static void clear(QVariant::Private *d) { switch (d->type) { -#ifndef QT_NO_ICON - case QVariant::Icon: - v_clear(d); - break; -#endif case QVariant::SizePolicy: v_clear(d); break; @@ -93,12 +82,6 @@ static void clear(QVariant::Private *d) static bool isNull(const QVariant::Private *d) { - switch(d->type) { -#ifndef QT_NO_ICON - case QVariant::Icon: - return v_cast(d)->isNull(); -#endif - } return false; } @@ -106,10 +89,6 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b) { Q_ASSERT(a->type == b->type); switch(a->type) { -#ifndef QT_NO_ICON - case QVariant::Icon: - return false; -#endif case QVariant::SizePolicy: return *v_cast(a) == *v_cast(b); default: @@ -133,11 +112,6 @@ static void streamDebug(QDebug dbg, const QVariant &v) { QVariant::Private *d = const_cast(&v.data_ptr()); switch (d->type) { -#ifndef QT_NO_ICON - case QVariant::Icon: - dbg.nospace() << *v_cast(d); - break; -#endif case QVariant::SizePolicy: dbg.nospace() << *v_cast(d); break; 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 511e2607446f20200e01c2142bdfd4db04e80e55..13f4dc374ddec99899906dd6e17e41b7829a86fe 100644 GIT binary patch delta 11 Qcmb1^o*>HR$;bc%014j#EC2ui delta 11 Qcmb1^o*>HR!N>pv014RvD*ylh 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 a7be10e1436faef4146d3afefa8635b59d9368aa..545fa96a1f3799e100e926a5e6de98ddf98943fc 100644 GIT binary patch delta 9 Qcmb1?oFK~L#mK+_00&Px# 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 664eb736a732ac417c982c8782258ba2b5d3854d..ee3da63a1800f4e273a9f7fcb27e0c7ad79f9ebd 100644 GIT binary patch delta 18 ScmY$|vDzyJaNK>z?H{sw>m delta 14 RcmdN;nIO%{00jR*000|C1^fU2 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 5cf664eb27e1f715853d83bdea004e9124fab522..b3fce0db6de378d0b2abd008f97179f50cc1a626 100644 GIT binary patch delta 12 TcmdPao}j{BFS?~nDV6~M6?g+r delta 12 TcmdPao}j|cz_2Y&=mY}*5zzwx 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 e8aa03af9bc63dc39c6d03ed20b99f5441f3f69b..ce31032451b15701afda2eef62542c59ad31f934 100644 GIT binary patch delta 31 lcma!apCBeK!Vt`m$dJcS%%A{dr7{#TWHO{VC{47N0sv&H25bNT delta 49 zcmZ>doFJyD#^A(|$xy;j48%nYsSJq>xeN*nVL(<9kgdQF3?%ayiXAj2>Pi6s`dA6% 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 bf3ca9ed4bb70f43b91f110f3fe5f66c1a903bc1..2f8713244c13fdcfa9147e3a0759c1b0078b7f2d 100644 GIT binary patch literal 23 ccmZQzVBlg1WbkB2X2@sAV_;x#W&95W041abCjbBd literal 23 ccmZQzVBlg1WbkB2X2@sAV_;yYVEhjR04CN3S^xk5 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 03665c1edc52b9c13ccb6d7a0adf95b6445e61b0..0ab1cbf6fa36e858d5147b69af6bb567cbbc5626 100644 GIT binary patch literal 25 ecmZQzVBld0WbkCjWk_U5XGmpWU~ppu5)1$%Bm#&4 literal 25 ecmZQzVBld0WbkCjWk_U5XGmpWU~pvw5)1$%9s-8| 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 7f7447a8218baf0efc04351dad2fa16a708c003c..ec82cc28714023f36892907812725613e8db84b8 100644 GIT binary patch delta 15 TcmdPYoFLET&B(yO0KyCa5aIz@ delta 15 TcmdPYoFLET#mKFpCHQQ&p1(E0*C+?X#+L@ delta 13 ScmZ>FpCHQQ$2d`60*C+?VFNV) 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 8d3f9b81e822e5aa8871762192feb34e71358a33..e4fc8054f924e753b8220ed87ce4af1711a247d1 100644 GIT binary patch delta 20 ccmbQsIG1sPG)o|({fCK)DigDfCi-ds077U6cK`qY delta 20 ccmbQsIG1sPG)n-Z{fCK)DigDfCi-ds076>^b^rhX 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 503c1a46644b9a908937fc73c5c4cc06632d36f5..b3caa096cb3fb3f150bbee4515716d754f514f32 100644 GIT binary patch delta 114 zcmX@9eo}oxA={okd-t9_J6WF5Z?Ys~$Yx1KA11ba`}XWPcW!b%)1uA1EMJ(=)vRPk ORWp|hQw^p$bC>{;iZZ1D delta 105 zcmX@9eo}oxA=}-%_wPS>GFhI{Z?Ys~$Yx1KAEwC*IYTDzWeVBM%kqT@UBOCrBn5N1 LFcqMgFoy{Mhy^RM 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 edafc2d185ad025f582ac2561e528b6b864f13d0..964eaa4ee244daea0a709e72abc3736c9b8e5dcf 100644 GIT binary patch delta 24 ecmZo+Y+)2&U|`^22xJIgNM*fB!015{IF8}}l 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 3e85997f2de2faeec267dccf1888569803537c97..c4b5f652b3fa25bb97aa279515e66c86d52c9cf7 100644 GIT binary patch delta 11 Qcmb1_pCHK=#>fB!01BZ2MF0Q* delta 11 Qcmb1_pCHK=%E$l&01BG{L;wH) 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 c498f8fd08a90cee0cc1dfdca6beffbd69bafa51..558767a6b4915b575e97bae1455bd19608e34850 100644 GIT binary patch delta 9 QcmcDwpCHQ^I#Es$01Q6@QUCw| delta 9 QcmcDwpCHQ^GEq(u01P_HR!N>pv014RvD*ylh delta 11 Qcmb1^o*>HR&d2}+0149pDgXcg 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 432068d921a27458e9d5ac2ffc5bd3cc4c80a0c4..0d91130d627dc76ab54cdf7a0e1b7da2523ea1de 100644 GIT binary patch delta 15 TcmY#apCHTS$M_!z7=Qo(Dvt$G delta 15 TcmY#apCHTS%lID%7=Qo(Duo45 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 3b209f1be249492ff685a8d9238d2e0293f8914f..640abfba00b57b8e04e71ebcb325afc57181a53e 100644 GIT binary patch delta 19 QcmdPao*>KT%gBHP02aRiU;qFB delta 19 QcmdPao*>KT!^nUH02Z+UUjP6A 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 52cddb5e934d1c0c0f62dd694c8d3d28d948ee1b..86a7aaf1edcacd76d56ad028064233701a053a57 100644 GIT binary patch delta 15 WcmYdIogmE;z-a$rqN2=1Yb^jKzXZMj delta 15 WcmYdIogmHP&uIT)qN2=1Yb^jKwFJEY 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 1c8bc45769c5a36353b2ca780b543c531a191b76..18267d24f5d3fa7c45de31b5301c56641b42c87f 100644 GIT binary patch delta 4 LcmY$An;-`O0we(M delta 9 Ocmb1BnjpvW9|!;t)dcSV 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 2bc3aeb18d0794b2fe0cdf15eadae10451416284..9fe7d9f936be1a5de52ef84ddbd088977b532a78 100644 GIT binary patch delta 23 QcmdPao**d{#K?dK034M8WdHyG delta 23 QcmdPao**d{$jE>O033q>WB>pF 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 b035f7f074ba42ee5b754badce6b115f67dd6d6a..b3c502f546fdf433f48eba1ea95f9064b5fc45e9 100644 GIT binary patch delta 31 RcmXpuo**d|%*cQP001hN0e%1g delta 31 RcmXpuo**d|#K?dH001g|0et`f 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 a804c5e655829e76aa20a01f88d17f8731d2f9d0..2db479c9ce664f2b6dd2d6f122254fee40cfb3ad 100644 GIT binary patch delta 13 UcmcDvo*>B-!Z=Y;YN7!f02V(33IG5A delta 13 UcmcDvo*>B-%s5d|YN7!f02Vg`2><{9 -- 2.7.4