Check if the property is cached in QmlGraphicsVisualDataModel::stringValue

This fixes a Bauhaus crash.

Task-number: BAUHAUS-227
Reviewed-by: Kai Koehne

1 files changed, 12 insertions, 8 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index b482db7..5b80ee0 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -908,14 +908,18 @@ QString QmlGraphicsVisualDataModel::stringValue(int index, const QString &name)
     QmlDeclarativeData *ddata = QmlDeclarativeData::get(data);
     if (ddata && ddata->propertyCache) {
         QmlPropertyCache::Data *prop = ddata->propertyCache->property(name);
-        if (prop->propType == QVariant::String) {
-            void *args[] = { &val, 0 };
-            QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
-        } else if (prop->propType == qMetaTypeId<QVariant>()) {
-            QVariant v;
-            void *args[] = { &v, 0 };
-            QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
-            val = v.toString();
+        if (prop) {
+            if (prop->propType == QVariant::String) {
+                void *args[] = { &val, 0 };
+                QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
+            } else if (prop->propType == qMetaTypeId<QVariant>()) {
+                QVariant v;
+                void *args[] = { &v, 0 };
+                QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
+                val = v.toString();
+            }
+        } else {
+            val = data->property(name.toUtf8()).toString();
         }
     } else {
         val = data->property(name.toUtf8()).toString();