Refactor QQuickVisualAdaptorModel to reduce memory consumption.

Don't inherit from QObject.
Use a single QQmlGuard for all model types, and reset the model
property if the model is deleted.
Construct v8 object template on demand.
Store model type specific data in a separate class that is allocated
on demand.

Change-Id: Id4f7b235741555b6ffba3fcf11727d85d6920e9e
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 78e9060acb..7c2037f796 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -82,7 +82,7 @@ static void initStandardTreeModel(QStandardItemModel *model)
 class SingleRoleModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(QStringList values WRITE setList)
+    Q_PROPERTY(QStringList values READ getList WRITE setList)
 public:
     SingleRoleModel(const QByteArray &role = "name", QObject *parent = 0)
         : QAbstractListModel(parent)
@@ -100,6 +100,7 @@ public:
 
     QStringList list;
 
+    QStringList getList() const { return list; }
     void setList(const QStringList &l) { list = l; }
 
 public slots:
@@ -122,9 +123,10 @@ protected:
 class StandardItem : public QObject, public QStandardItem
 {
     Q_OBJECT
-    Q_PROPERTY(QString text WRITE setText)
+    Q_PROPERTY(QString text READ readText WRITE setText)
 
 public:
+    QString readText() const { return text(); }
     void writeText(const QString &text) { setText(text); }
 };