Add a declarative data ptr to QObjectPrivate

This data ptr does not increase the size of the QObject, as we take advantage of space only used during destruction.  Currently this data is only used to store an object's QmlContext, but it will be used for more later.

1 files changed, 0 insertions, 11 deletions

diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 992185a..24f2d5c 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -537,7 +537,6 @@ ModelNode::~ModelNode()
 struct ListModelData
 {
     int dataOffset;
-    int id;
     int instrCount;
     ListInstruction *instructions() const { return (ListInstruction *)((char *)this + sizeof(ListModelData)); }
 };
@@ -546,7 +545,6 @@ QByteArray ListModelParser::compile(QXmlStreamReader& reader, bool *ok)
 {
     *ok = true;
 
-    QByteArray id;
     QByteArray data;
     QList<ListInstruction> instr;
     int depth=0;
@@ -649,10 +647,6 @@ QByteArray ListModelParser::compile(QXmlStreamReader& reader, bool *ok)
     rv.resize(size);
 
     ListModelData *lmd = (ListModelData *)rv.data();
-    if(id.count())
-        lmd->id = 0;
-    else
-        lmd->id = -1;
     lmd->dataOffset = sizeof(ListModelData) + 
                      instr.count() * sizeof(ListInstruction);
     lmd->instrCount = instr.count();
@@ -709,11 +703,6 @@ QVariant ListModelParser::create(const QByteArray &d)
         }
     }
 
-    if(lmd->id != -1) {
-        QmlContext *ctxt = QmlContext::activeContext();
-        ctxt->setContextProperty(QLatin1String(data + lmd->id), rv);
-    }
-
     return QVariant::fromValue(rv);
 }