diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-23 05:08:36 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-23 05:08:36 (GMT) |
commit | 718c4ff7e9a9cbf0150c937c1036a03935dda3e1 (patch) | |
tree | 4f81e1b337975de012653152f7c2f59dc609b7cd /src/declarative/qml | |
parent | d5c1df72cecda0344717224fede54d83b6d5f15b (diff) | |
download | Qt-718c4ff7e9a9cbf0150c937c1036a03935dda3e1.zip Qt-718c4ff7e9a9cbf0150c937c1036a03935dda3e1.tar.gz Qt-718c4ff7e9a9cbf0150c937c1036a03935dda3e1.tar.bz2 |
Fix crash
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/qmlengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index a58b35e..72603ed 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -1255,7 +1255,8 @@ QmlTypeNameScriptClass::queryProperty(const QScriptValue &scriptObject, } else { // Must be an attached property this->object = qmlAttachedPropertiesObjectById(bridge.type->index(), bridge.object); - Q_ASSERT(this->object); + if (!this->object) + return 0; return ep->queryObject(strName, id, this->object); } } |