aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2011-11-25 16:09:38 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-25 08:10:20 +0100
commit850476b75d0857f2f64fa6eb82d39c22322368a7 (patch)
tree8cc97309d9c5d631b924fa339979c0e5b6633a55 /src
parent900137ea6a593f612e091cf629fc3a0ec929fb5f (diff)
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 <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qquickvisualdatamodel.cpp3
1 files changed, 2 insertions, 1 deletions
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();
}
+
}
/*!