diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2011-04-12 01:36:37 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2011-04-12 01:42:19 (GMT) |
commit | 3bc0d853a09ae55c158946a99284a47b0b30a3b4 (patch) | |
tree | 7cadc1f30e68438591946708a9530f61fd7a1740 /src/declarative/qml/qdeclarativecomponent_p.h | |
parent | f2219ce983098fc14655d8f3bb8a7fee2c9abe4d (diff) | |
download | Qt-3bc0d853a09ae55c158946a99284a47b0b30a3b4.zip Qt-3bc0d853a09ae55c158946a99284a47b0b30a3b4.tar.gz Qt-3bc0d853a09ae55c158946a99284a47b0b30a3b4.tar.bz2 |
Fix regression in wigglytext.qml
This change re-adds the code removed in
8e9c28eaa4d7a3372b9a9a21a984701b62f96456 (which caused this regression),
while keeping the new code as well (to specially handle the case of
registration in componentCompleted()).
Change-Id: I707e3d2ead9ea25079f79cd5e5886d1dc1c69d1b
Task-number: QTBUG-18362
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativecomponent_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index 020c5e0..f8bec2b 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -101,6 +101,7 @@ public: ConstructionState() : componentAttached(0), completePending(false) {} QList<QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding> > bindValues; QList<QDeclarativeEnginePrivate::SimpleList<QDeclarativeParserStatus> > parserStatus; + QList<QPair<QDeclarativeGuard<QObject>, int> > finalizedParserStatus; QDeclarativeComponentAttached *componentAttached; QList<QDeclarativeError> errors; bool completePending; |