diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-01-27 11:33:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 00:22:45 +0100 |
| commit | b06108350b1390b51886474628e03e2e84640548 (patch) | |
| tree | bbf00677d9edc64e2549f2cc3ee42f1edd5a50f4 /src/qml/qml/v8 | |
| parent | a27fd584df0ec3d1d072501d8fefe576a97a2e53 (diff) | |
Ensure that dynamic property storing QObject ptr notifies on delete
Previously, when a QObject ptr was stored in a dynamic variant
property, the value of the property could change (to a zero ptr)
if the QObject was deleted without a notify signal being emitted
by the QDeclarativeVMEMetaObject which stores the property.
This commit ensures that such a notify signal is emitted correctly.
Task-number: QTBUG-23451
Change-Id: I5689abd984b177737f8d5f18950838b73ebde328
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/v8')
| -rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index 78b2cb719c..5842e29257 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -1043,7 +1043,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::newQObject(QObject *object) return v8::Null(); if (QObjectPrivate::get(object)->wasDeleted) - return v8::Undefined(); + return v8::Null(); QQmlData *ddata = QQmlData::get(object, true); |