diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:59:56 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:02:08 +0100 |
| commit | 47c45bb1e487b3823281683c1110d9269f144582 (patch) | |
| tree | 4c687d46d9aa7d90f064a25e6c7f0241ae28e16d /src/qml/qml/v8/qv8contextwrapper.cpp | |
| parent | 677be9a27770ff48dd771ec4fc1c66139aac4aa8 (diff) | |
| parent | 7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
Diffstat (limited to 'src/qml/qml/v8/qv8contextwrapper.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8contextwrapper.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qv8contextwrapper.cpp b/src/qml/qml/v8/qv8contextwrapper.cpp index b2c60fe7a8..9f18afc5cb 100644 --- a/src/qml/qml/v8/qv8contextwrapper.cpp +++ b/src/qml/qml/v8/qv8contextwrapper.cpp @@ -309,7 +309,6 @@ v8::Handle<v8::Value> QV8ContextWrapper::Getter(v8::Local<v8::String> property, const QVariant &value = cp->propertyValues.at(propertyIdx); if (value.userType() == qMetaTypeId<QList<QObject*> >()) { QQmlListProperty<QObject> prop(context->asQQmlContext(), (void*) qintptr(propertyIdx), - 0, QQmlContextPrivate::context_count, QQmlContextPrivate::context_at); return engine->listWrapper()->newList(prop, qMetaTypeId<QQmlListProperty<QObject> >()); |