diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 21:48:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:36 +0200 |
| commit | 6c9f1c8ed93374c16ca6ac540f39e98b451be0d8 (patch) | |
| tree | 476d0046c6016a8cd62bfc29ed9697d98e98f738 /src/qml/jsruntime/qv4sequenceobject.cpp | |
| parent | bdb27b96acbd38531879378c48959a5a1cd60963 (diff) | |
| download | qtdeclarative-6c9f1c8ed93374c16ca6ac540f39e98b451be0d8.tar.gz | |
Use a ReturnedValue for Managed::getIndexed()
Change-Id: I0371ed21c4ef99564d3ffa1082dd109e890a78bf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4sequenceobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index b1df8d95af..68ae33335e 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -458,7 +458,7 @@ public: Container result; quint32 length = array->arrayLength(); for (quint32 i = 0; i < length; ++i) - result << convertValueToElement<typename Container::value_type>(array->getIndexed(i)); + result << convertValueToElement<typename Container::value_type>(QV4::Value::fromReturnedValue(array->getIndexed(i))); return QVariant::fromValue(result); } @@ -486,8 +486,8 @@ private: int m_propertyIndex; bool m_isReference; - static QV4::Value getIndexed(QV4::Managed *that, uint index, bool *hasProperty) - { return static_cast<QQmlSequence<Container> *>(that)->containerGetIndexed(index, hasProperty); } + static QV4::ReturnedValue getIndexed(QV4::Managed *that, uint index, bool *hasProperty) + { return static_cast<QQmlSequence<Container> *>(that)->containerGetIndexed(index, hasProperty).asReturnedValue(); } static void putIndexed(Managed *that, uint index, const QV4::Value &value) { static_cast<QQmlSequence<Container> *>(that)->containerPutIndexed(index, value); } static QV4::PropertyAttributes queryIndexed(const QV4::Managed *that, uint index) |