diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-12-09 09:09:36 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-12-09 09:09:36 (GMT) |
| commit | 91518478d32a5d5ce188b02f92e744fc782dd687 (patch) | |
| tree | b1ac54dd94358b0ad406c22d80b40f871fd196eb /src/declarative/qml/qdeclarativecompiler_p.h | |
| parent | 1e84041247505502fa3b3f4865126719321f70d3 (diff) | |
| parent | 40d8ec7118d5f39acec3f71d33a87f0483bd2b2b (diff) | |
| download | Qt-91518478d32a5d5ce188b02f92e744fc782dd687.zip Qt-91518478d32a5d5ce188b02f92e744fc782dd687.tar.gz Qt-91518478d32a5d5ce188b02f92e744fc782dd687.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 43a0901..7d76ad9 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -89,14 +89,12 @@ public: struct TypeReference { TypeReference() - : type(0), component(0), ref(0) {} + : type(0), component(0) {} QByteArray className; QDeclarativeType *type; -// QDeclarativeComponent *component; QDeclarativeCompiledData *component; - QDeclarativeRefCount *ref; QObject *createInstance(QDeclarativeContextData *, const QBitField &, QList<QDeclarativeError> *) const; const QMetaObject *metaObject() const; }; @@ -254,6 +252,7 @@ private: void genObject(QDeclarativeParser::Object *obj); void genObjectBody(QDeclarativeParser::Object *obj); + void genValueTypeProperty(QDeclarativeParser::Object *obj,QDeclarativeParser::Property *); void genComponent(QDeclarativeParser::Object *obj); void genValueProperty(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj); void genListProperty(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj); |