diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-01-13 15:12:46 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-05 13:06:02 +0100 |
| commit | c9319f17f4176ea895979dd11e5e1304f14660fc (patch) | |
| tree | 35cbf5a61e8e767479e89afb37e593a11c46fb57 /src/corelib | |
| parent | d97fd99270763468df08c4fb74c6df52db9b2ff6 (diff) | |
Do not crash trying to load or save QModelIndex.
QModelIndex doesn't have data stream operators loading or saving this
type should gracefully fail.
Change-Id: I6a1a3bab3f83ff4921369a07fdb54ac462eff554
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index cdabf2c6d2..50b11e0e98 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -633,6 +633,7 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::VoidStar: case QMetaType::QObjectStar: case QMetaType::QWidgetStar: + case QMetaType::QModelIndex: return false; case QMetaType::Long: stream << qlonglong(*static_cast<const long *>(data)); @@ -837,6 +838,7 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::VoidStar: case QMetaType::QObjectStar: case QMetaType::QWidgetStar: + case QMetaType::QModelIndex: return false; case QMetaType::Long: { qlonglong l; |