aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvmemetaobject_p.h
diff options
context:
space:
mode:
authorFrank Meerkoetter <frank.meerkoetter@basyskom.com>2015-07-20 22:06:40 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-08-18 20:25:47 +0000
commitd40b206b734ca001819129b92ff270bfe2ea1942 (patch)
treeb9adb73acb1ca12cc4e82e355fe2f1a652557685 /src/qml/qml/qqmlvmemetaobject_p.h
parenteeb466a3b9208dd25b2bd7003d03c264f0a4f4a7 (diff)
Port QObject* away from QQmlVMEVariant
QObjects are now stored as QV4::QObjectWrapper in a javascript array. This is part of a series of patches slimming down the memory usage of QML properties. Change-Id: I270831d0f0f7bc17842cd2f8d2eb9661e09a3364 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject_p.h')
-rw-r--r--src/qml/qml/qqmlvmemetaobject_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index 96b606203a..7009b47a5f 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -142,7 +142,7 @@ public:
inline void setGuardedValue(QObject *obj, QQmlVMEMetaObject *target, int index);
QQmlVMEMetaObject *m_target;
- unsigned m_isVar : 1;
+ unsigned m_isVar : 1; // TODO: remove?
int m_index : 31;
};
@@ -214,6 +214,7 @@ public:
QDate readPropertyAsDate(int id);
QDateTime readPropertyAsDateTime(int id);
QRectF readPropertyAsRectF(int id);
+ QObject* readPropertyAsQObject(int id);
void writeProperty(int id, int v);
void writeProperty(int id, bool v);
@@ -225,6 +226,7 @@ public:
void writeProperty(int id, const QDate& v);
void writeProperty(int id, const QDateTime& v);
void writeProperty(int id, const QRectF& v);
+ void writeProperty(int id, QObject *v);
void ensureQObjectWrapper();