projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e562efd
)
Remove last v8 dependency in qqmlvmemetaobject
author
Lars Knoll
<lars.knoll@digia.com>
Mon, 3 Jun 2013 13:15:40 +0000
(15:15 +0200)
committer
Simon Hausmann
<simon.hausmann@digia.com>
Mon, 3 Jun 2013 13:39:58 +0000
(15:39 +0200)
Change-Id: If3b45ea3048f6167a121011191aa5f42b2fe2e88
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/qqmlvmemetaobject.cpp
patch
|
blob
|
history
diff --git
a/src/qml/qml/qqmlvmemetaobject.cpp
b/src/qml/qml/qqmlvmemetaobject.cpp
index
86d4065
..
0ccaf7f
100644
(file)
--- a/
src/qml/qml/qqmlvmemetaobject.cpp
+++ b/
src/qml/qml/qqmlvmemetaobject.cpp
@@
-1232,7
+1232,10
@@
void QQmlVMEMetaObject::mark()
void QQmlVMEMetaObject::allocateVarPropertiesArray()
{
- varProperties = v8::Array::New(metaData->varPropertyCount)->v4Value();
+ QQmlEngine *qml = qmlEngine(object);
+ assert(qml);
+ QV4::ExecutionEngine *v4 = QV8Engine::getV4(qml->handle());
+ varProperties = QV4::Value::fromObject(v4->newArrayObject(metaData->varPropertyCount));
varPropertiesInitialized = true;
}