summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-14 13:35:04 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-14 14:15:22 +0200
commit4b7a0a071728233b1dbb89d59a8253a32c020007 (patch)
treef1f108c87c90c16218da5ef0a9fb560d33f4a968 /src/declarative
parent3ef7c3fc56d41f0028e7ee822abd95fe5c21bd7e (diff)
Fix copy and paste error
Fix error 13 identified by static analysis from http://www.viva64.com/en/b/0251/ This is in line with qtdeclarative. Change-Id: I3d3879bb93f9ae5bdcdd583645b1657f55140fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/declarative')
-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 341e708e..5573f49d 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -439,7 +439,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)