From c9319f17f4176ea895979dd11e5e1304f14660fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 13 Jan 2012 15:12:46 +0100 Subject: [PATCH] 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 --- src/corelib/kernel/qmetatype.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index cdabf2c..50b11e0 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(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; -- 2.7.4