diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-29 23:58:56 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-29 23:58:56 (GMT) |
commit | 56805f1f4d001f83f888b01076b495798378a92c (patch) | |
tree | d4f8e992edaacaa282f18500088dfc6506d160be /src/declarative/util/qmlstategroup.cpp | |
parent | 326cc83e3677cefe230d813a89ea55cd56fc22bf (diff) | |
download | Qt-56805f1f4d001f83f888b01076b495798378a92c.zip Qt-56805f1f4d001f83f888b01076b495798378a92c.tar.gz Qt-56805f1f4d001f83f888b01076b495798378a92c.tar.bz2 |
Fix regression introduced in classComplete -> componentComplete.
Diffstat (limited to 'src/declarative/util/qmlstategroup.cpp')
-rw-r--r-- | src/declarative/util/qmlstategroup.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index ed9221b..3a07fbe 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -134,6 +134,18 @@ void QmlStateGroup::classBegin() d->componentComplete = false; } +void QmlStateGroup::componentComplete() +{ + Q_D(QmlStateGroup); + d->componentComplete = true; + d->updateAutoState(); + if (!d->currentState.isEmpty()) { + QString cs = d->currentState; + d->currentState = QString(); + d->setCurrentStateInternal(cs, true); + } +} + void QmlStateGroup::updateAutoState() { Q_D(QmlStateGroup); @@ -270,18 +282,6 @@ void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state, newState->apply(q, transition, oldState); } -void QmlStateGroup::componentComplete() -{ - Q_D(QmlStateGroup); - d->updateAutoState(); - d->componentComplete = true; - if (!d->currentState.isEmpty()) { - QString cs = d->currentState; - d->currentState = QString(); - d->setCurrentStateInternal(cs, true); - } -} - QmlState *QmlStateGroup::findState(const QString &name) const { Q_D(const QmlStateGroup); |