aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-10-05 12:43:32 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-07 08:32:51 +0200
commit402363215943976f2fa5b6b2db9b7ca588505df2 (patch)
treeb27c3a02089a856f27b4b004c1fa0b5f6409998b /src/declarative/util
parent2d691c84cb4acbddb1fb6c229bc44974d2e3ee08 (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/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativestategroup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 4f9593011b..a349ea9e85 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -444,7 +444,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
applyingState = true;
- QDeclarativeTransition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state);
+ QDeclarativeTransition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
if (stateChangeDebug()) {
qWarning() << this << "Changing state. From" << currentState << ". To" << state;
if (transition)