aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvmemetaobject.cpp
diff options
context:
space:
mode:
authorFrank Meerkoetter <frank.meerkoetter@basyskom.com>2015-08-07 22:47:40 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-08-18 20:26:46 +0000
commit3d4795b7d109d99726e17446d933bae1e22bb751 (patch)
treeb205c95b97a32a7121d2462a3d22ddce1461f67d /src/qml/qml/qqmlvmemetaobject.cpp
parent1b8106bc2516a66c4f721deaf4470da8b805ac3d (diff)
Allocate a JS wrapper if there are any properties
Properties are now stored as QV4::Values. Change-Id: I586ccacbeb3c131ff4af2e5913c484dc4f4b7462 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 6a12674fb0..c7993e6ec7 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -171,10 +171,10 @@ QQmlVMEMetaObject::QQmlVMEMetaObject(QObject *obj,
int list_type = qMetaTypeId<QQmlListProperty<QObject> >();
int qobject_type = qMetaTypeId<QObject*>();
int variant_type = qMetaTypeId<QVariant>();
- // Need JS wrapper to ensure variant and var properties are marked.
+ // Need JS wrapper to ensure properties are marked.
// ### FIXME: I hope that this can be removed once we have the proper scope chain
// set up and the JS wrappers always exist.
- bool needsJSWrapper = (metaData->varPropertyCount > 0);
+ bool needsJSWrapper = (metaData->propertyCount > 0);
// ### Optimize
for (int ii = 0; ii < metaData->propertyCount - metaData->varPropertyCount; ++ii) {