From 850476b75d0857f2f64fa6eb82d39c22322368a7 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Fri, 25 Nov 2011 16:09:38 +1000 Subject: Fix crash calling VisualDataGroup.setGroups during initialization. A VisualDataModel's meta type is constructed in componentComplete(), avoid accessing it before then. Change-Id: Ic9fdfa3c458d5da3014289b777f74df87aa97103 Reviewed-by: Martin Jones --- src/declarative/items/qquickvisualdatamodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/declarative') diff --git a/src/declarative/items/qquickvisualdatamodel.cpp b/src/declarative/items/qquickvisualdatamodel.cpp index 7d0abfcfe0..ce8548456e 100644 --- a/src/declarative/items/qquickvisualdatamodel.cpp +++ b/src/declarative/items/qquickvisualdatamodel.cpp @@ -2116,7 +2116,7 @@ void QQuickVisualDataGroup::remove(QDeclarativeV8Function *args) bool QQuickVisualDataGroupPrivate::parseGroupArgs( QDeclarativeV8Function *args, int *index, int *count, int *groups) const { - if (!model) + if (!model || !QQuickVisualDataModelPrivate::get(model)->m_cacheMetaType) return false; if (args->Length() < 2) @@ -2300,6 +2300,7 @@ void QQuickVisualDataGroup::move(QDeclarativeV8Function *args) model->itemsMoved(removes, inserts); model->emitChanges(); } + } /*! -- cgit v1.2.3