qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conversion of variantlists to ArrayObjects 

Fixes a crash in the qquickmultipointtoucharea test

Change-Id: Ic1ca5220e5e7a569e3cc499ba120296fb885d6c0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Lars Knoll 2013-06-21 14:14:37 +02:00 committed by Simon Hausmann
parent 34b69c3ce4
commit 38cd35edcd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qml/qml/v8/qv8engine.cpp
View File

@ -304,9 +304,11 @@ QV4::Value QV8Engine::fromVariant(const QVariant &variant)
// directly against QList<QObject*>?
const QList<QObject *> &list = *(QList<QObject *>*)ptr;
QV4::ArrayObject *a = m_v4Engine->newArrayObject();
a->setArrayLength(list.count());
a->arrayReserve(list.count());
for (int ii = 0; ii < list.count(); ++ii)
a->arrayData[ii].value = QV4::QObjectWrapper::wrap(m_v4Engine, list.at(ii));
a->arrayDataLen = list.count();
a->setArrayLengthUnchecked(list.count());
return QV4::Value::fromObject(a);
}