diff options
author | Chris Adams <christopher.adams@nokia.com> | 2011-12-23 13:01:25 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-23 04:20:18 +0100 |
commit | 1f4fe0aca4fc70ece7235623aaf88225531f1243 (patch) | |
tree | 57d86bdefeabc681e8fd235522d7f7d571b6b103 /src | |
parent | 9e61464c9026c4b766e05ea8c784f8e6a615adba (diff) |
Fix crash in var property setter
Previously, the function didn't terminate after calling the setter
recursively, as it should have. This patch ensures that the setter
is called correctly and then returns, and adds a unit test to ensure
that no regression occurs.
Task-number: QTBUG-23330
Change-Id: If512fca174e5224c2c53caad11f77782e6cead9f
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index a37be927e8..e5e864142a 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp @@ -992,6 +992,7 @@ void QDeclarativeVMEMetaObject::setVMEProperty(int index, v8::Handle<v8::Value> if (index < propOffset) { Q_ASSERT(parent); static_cast<QDeclarativeVMEMetaObject *>(parent)->setVMEProperty(index, v); + return; } return writeVarProperty(index - propOffset, v); } |