summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-16 04:28:36 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-16 04:28:36 (GMT)
commitd51de46fe6d52126c57623156a5c7e4ed61a51a7 (patch)
tree7b9c2c14b87a2696c4db1df1bd7dcb5239e22d8d /src
parent15e8301c3029646bfc2b78b821a0688ee7b287ae (diff)
parent86f89023b52e00d155d6b14762f1a99a70d67e60 (diff)
downloadQt-d51de46fe6d52126c57623156a5c7e4ed61a51a7.zip
Qt-d51de46fe6d52126c57623156a5c7e4ed61a51a7.tar.gz
Qt-d51de46fe6d52126c57623156a5c7e4ed61a51a7.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qmlstate.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 7cc548f..1f5dbad 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -433,8 +433,11 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
// Output for debugging
if (stateChangeDebug()) {
foreach(const Action &action, applyList) {
- qWarning() << " Action:" << action.property.object()
- << action.property.name() << action.toValue;
+ if (action.event)
+ qWarning() << " Action event:" << action.event;
+ else
+ qWarning() << " Action:" << action.property.object()
+ << action.property.name() << action.toValue;
}
}