diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-22 01:18:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-22 01:18:07 (GMT) |
| commit | 141b48584633189c0fa83e9ca04f017048a5c5ff (patch) | |
| tree | d3659b5fe6af575a9a996885ba8bcebcf93d2fe8 /src | |
| parent | 8d467e0ab02abfae1e0ac851c236485231aa682f (diff) | |
| download | Qt-141b48584633189c0fa83e9ca04f017048a5c5ff.zip Qt-141b48584633189c0fa83e9ca04f017048a5c5ff.tar.gz Qt-141b48584633189c0fa83e9ca04f017048a5c5ff.tar.bz2 | |
Autotest
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 6d64f63..9e6c060 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -767,6 +767,9 @@ void QDeclarativeEngine::setContextForObject(QObject *object, QDeclarativeContex */ void QDeclarativeEngine::setObjectOwnership(QObject *object, ObjectOwnership ownership) { + if (!object) + return; + QDeclarativeData *ddata = QDeclarativeData::get(object, true); if (!ddata) return; @@ -780,6 +783,9 @@ void QDeclarativeEngine::setObjectOwnership(QObject *object, ObjectOwnership own */ QDeclarativeEngine::ObjectOwnership QDeclarativeEngine::objectOwnership(QObject *object) { + if (!object) + return CppOwnership; + QDeclarativeData *ddata = QDeclarativeData::get(object, false); if (!ddata) return CppOwnership; |