summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-02 08:33:28 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-05 02:40:49 (GMT)
commita6a2a2373c63ec3c67be62814bc3391de1338883 (patch)
treed28b83010a532259d0f6387a4b6dd90fb5ec7b98
parent44638d0f310aad59336ad44f427351a4b9c40f15 (diff)
downloadQt-a6a2a2373c63ec3c67be62814bc3391de1338883.zip
Qt-a6a2a2373c63ec3c67be62814bc3391de1338883.tar.gz
Qt-a6a2a2373c63ec3c67be62814bc3391de1338883.tar.bz2
Crash
-rw-r--r--src/declarative/qml/qmltypenamescriptclass.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp
index 7c5e5b0..61b57c4 100644
--- a/src/declarative/qml/qmltypenamescriptclass.cpp
+++ b/src/declarative/qml/qmltypenamescriptclass.cpp
@@ -125,13 +125,15 @@ QmlTypeNameScriptClass::queryProperty(Object *obj, const Identifier &name,
}
}
return 0;
- } else {
+ } else if (data->object) {
// Must be an attached property
object = qmlAttachedPropertiesObjectById(data->type->index(), data->object);
if (!object) return 0;
return ep->objectClass->queryProperty(object, name, flags);
}
}
+
+ return 0;
}
QScriptValue QmlTypeNameScriptClass::property(Object *obj, const Identifier &name)