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 /src/corelib/kernel/qmetatype.cpp | |
| 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 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 48cabeb636..e1cebc453d 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; |