diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativestategroup.cpp --- a/src/declarative/util/qdeclarativestategroup.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativestategroup.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -88,6 +88,7 @@ /*! \qmlclass StateGroup QDeclarativeStateGroup + \ingroup qml-state-elements \since 4.7 \brief The StateGroup element provides state support for non-Item elements. @@ -112,7 +113,7 @@ } \endqml - \sa {qmlstate}{States} {state-transitions}{Transitions}, {QtDeclarative} + \sa {qmlstate}{States} {Transitions}, {QtDeclarative} */ QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent) @@ -204,7 +205,7 @@ } \endqml - \sa {state-transitions}{Transitions} + \sa {Transitions} */ QDeclarativeListProperty QDeclarativeStateGroup::transitionsProperty() { @@ -271,7 +272,7 @@ return; } else if (!d->currentState.isEmpty()) { QString cs = d->currentState; - d->currentState = QString(); + d->currentState.clear(); d->setCurrentStateInternal(cs, true); } } @@ -313,7 +314,7 @@ } } if (revert) { - bool rv = currentState != QString(); + bool rv = !currentState.isEmpty(); q->setState(QString()); return rv; } else {