diff options
Diffstat (limited to 'src/quick/util/qquickstategroup.cpp')
| -rw-r--r-- | src/quick/util/qquickstategroup.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index 6e88ec55aa..2d8ed951fb 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -94,7 +94,7 @@ public: /*! \qmlclass StateGroup QQuickStateGroup \inqmlmodule QtQuick 2 - \ingroup qml-state-elements + \ingroup qtquick-states \brief Provides built-in state support for non-Item elements Item (and all derived elements) provides built in support for states and transitions @@ -339,8 +339,8 @@ bool QQuickStateGroupPrivate::updateAutoState() if (state->isWhenKnown()) { if (state->isNamed()) { if (state->when() && state->when()->evaluate().toBool()) { - if (stateChangeDebug()) - qWarning() << "Setting auto state due to:" + if (stateChangeDebug()) + qWarning() << "Setting auto state due to:" << state->when()->expression(); if (currentState != state->name()) { q->setState(state->name()); @@ -377,7 +377,7 @@ QQuickTransition *QQuickStateGroupPrivate::findTransition(const QString &from, c for (int ii = 0; ii < 2; ++ii) { if (ii && (!t->reversible() || - (t->fromState() == QLatin1String("*") && + (t->fromState() == QLatin1String("*") && t->toState() == QLatin1String("*")))) break; QStringList fromState; @@ -428,7 +428,7 @@ QQuickTransition *QQuickStateGroupPrivate::findTransition(const QString &from, c return highest; } -void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state, +void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state, bool ignoreTrans) { Q_Q(QQuickStateGroup); @@ -448,7 +448,7 @@ void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state, if (stateChangeDebug()) { qWarning() << this << "Changing state. From" << currentState << ". To" << state; if (transition) - qWarning() << " using transition" << transition->fromState() + qWarning() << " using transition" << transition->fromState() << transition->toState(); } |