diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-05 12:43:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 08:32:51 +0200 |
| commit | 402363215943976f2fa5b6b2db9b7ca588505df2 (patch) | |
| tree | b27c3a02089a856f27b4b004c1fa0b5f6409998b /src/qtquick1 | |
| parent | 2d691c84cb4acbddb1fb6c229bc44974d2e3ee08 (diff) | |
Remove redundant checks in qdeclarativestategroup
Checking once should be enough for everyone.
Task-number: QTBUG-20482
Change-Id: I6cc1c608d9c1da0f4f745e436b9611937a8db160
Reviewed-on: http://codereview.qt-project.org/6054
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/qtquick1')
| -rw-r--r-- | src/qtquick1/util/qdeclarativestategroup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtquick1/util/qdeclarativestategroup.cpp b/src/qtquick1/util/qdeclarativestategroup.cpp index 539fbbadab..70b7b37dd8 100644 --- a/src/qtquick1/util/qdeclarativestategroup.cpp +++ b/src/qtquick1/util/qdeclarativestategroup.cpp @@ -445,7 +445,7 @@ void QDeclarative1StateGroupPrivate::setCurrentStateInternal(const QString &stat applyingState = true; - QDeclarative1Transition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state); + QDeclarative1Transition *transition = ignoreTrans ? 0 : findTransition(currentState, state); if (stateChangeDebug()) { qWarning() << this << "Changing state. From" << currentState << ". To" << state; if (transition) |