diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-09 04:29:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-09 04:29:10 (GMT) |
| commit | 9b7d77460c38ec93d98fa4779826b32bea2eaaff (patch) | |
| tree | df741aad025f325e0f15330887bcd82b0226b366 /src/declarative/qml/qmlparser_p.h | |
| parent | 04511e3dbbcdf40489852babbf4753e0f744c26f (diff) | |
| parent | 3a0cb6ebef245780782fcab6709e471d26789590 (diff) | |
| download | Qt-9b7d77460c38ec93d98fa4779826b32bea2eaaff.zip Qt-9b7d77460c38ec93d98fa4779826b32bea2eaaff.tar.gz Qt-9b7d77460c38ec93d98fa4779826b32bea2eaaff.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlparser_p.h')
| -rw-r--r-- | src/declarative/qml/qmlparser_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index e0579b0..16862eb 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -151,6 +151,8 @@ namespace QmlParser Property *defaultProperty; QHash<QByteArray, Property *> properties; + QList<Object *> scriptBlockObjects; + // Output of the compilation phase (these properties continue to exist // in either the defaultProperty or properties members too) void addValueProperty(Property *); @@ -164,6 +166,9 @@ namespace QmlParser QList<Property *> groupedProperties; QList<Property *> valueTypeProperties; + // Script blocks that were nested under this object + QStringList scriptBlocks; + // The bytes to cast instances by to get to the QmlParserStatus // interface. -1 indicates the type doesn't support this interface. // Set by the QmlCompiler. |