diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-04-28 21:40:12 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-29 13:16:17 +0200 |
| commit | 7b8af027e5d4188311429dc8df1de67f44e5252d (patch) | |
| tree | ca100db5f5e13969a70a58effbc76a11ddbd6453 /src/qml/qml/v8/qv8worker.cpp | |
| parent | 0c297f55c831e285e1a44707af03704a081035d7 (diff) | |
Convert QObject methods inQV8Enginer to v4 based API
Change-Id: I954daac83b36d4cb667ecd7923577af90cfc4f9e
Fixup newQObject
Change-Id: I7b81754165b319a7fd81838313d0d654aad1132e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8worker.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8worker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8worker.cpp b/src/qml/qml/v8/qv8worker.cpp index 8aef8c2e94..0369f47303 100644 --- a/src/qml/qml/v8/qv8worker.cpp +++ b/src/qml/qml/v8/qv8worker.cpp @@ -241,10 +241,10 @@ void QV8Worker::serialize(QByteArray &data, v8::Handle<v8::Value> v, QV8Engine * serialize(data, val, engine); } } - } else if (engine->isQObject(v)) { + } else if (engine->isQObject(v->v4Value())) { // XXX TODO: Generalize passing objects between the main thread and worker scripts so // that others can trivially plug in their elements. - QQmlListModel *lm = qobject_cast<QQmlListModel *>(engine->toQObject(v)); + QQmlListModel *lm = qobject_cast<QQmlListModel *>(engine->toQObject(v->v4Value())); if (lm && lm->agent()) { QQmlListModelWorkerAgent *agent = lm->agent(); agent->addref(); |