diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-11-30 04:30:35 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-11-30 04:31:48 (GMT) |
| commit | 46213b30d639505849d079b30e72ef8393e9a748 (patch) | |
| tree | 4b144b2af2fd4cdd614e213342d27cec7550949c /src/declarative | |
| parent | 1de080649c6b810ed6bc05e883795687ecde1f3d (diff) | |
| download | Qt-46213b30d639505849d079b30e72ef8393e9a748.zip Qt-46213b30d639505849d079b30e72ef8393e9a748.tar.gz Qt-46213b30d639505849d079b30e72ef8393e9a748.tar.bz2 | |
Correctly handle CppOwnership even when a QDeclarativeData doesn't exist
Task-number: QTBUG-15695
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index c646302..add1ab7 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -897,9 +897,7 @@ void QDeclarativeEngine::setObjectOwnership(QObject *object, ObjectOwnership own if (!object) return; - // No need to do anything if CppOwnership and there is no QDeclarativeData as - // the current ownership must be CppOwnership - QDeclarativeData *ddata = QDeclarativeData::get(object, ownership == JavaScriptOwnership); + QDeclarativeData *ddata = QDeclarativeData::get(object, true); if (!ddata) return; |