diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-16 00:12:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-16 00:12:16 (GMT) |
| commit | 7b0d764f37fa4009dc1556666eb8a141164fb0e0 (patch) | |
| tree | 3d5d1c0f5aadc2f3e2a5eccacd2fc2f32b21e385 /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | bac82138b76ac9f6a0603fa454f6660d139287d0 (diff) | |
| parent | 16ae00c689faac5d7af312ae31d7f715dc6e0745 (diff) | |
| download | Qt-7b0d764f37fa4009dc1556666eb8a141164fb0e0.zip Qt-7b0d764f37fa4009dc1556666eb8a141164fb0e0.tar.gz Qt-7b0d764f37fa4009dc1556666eb8a141164fb0e0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 7766ad6..b3bba43 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -215,7 +215,7 @@ public: QList<SimpleList<QDeclarativeAbstractBinding> > bindValues; QList<SimpleList<QDeclarativeParserStatus> > parserStatus; - QDeclarativeComponentAttached *componentAttacheds; + QDeclarativeComponentAttached *componentAttached; bool inBeginCreate; |