summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-02-21 14:59:42 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-02-21 14:59:42 (GMT)
commit37fffc23dae8e10c89d5ad78e7e5d08693b4cb17 (patch)
tree30fb12030c2559d412481aeedd1707f12216f377
parent11f11f8ad562472759df24a410d52edd63eb2cf4 (diff)
parent95a9ab2d0e94c735ac813c809a4fe98dd466cc64 (diff)
downloadQt-37fffc23dae8e10c89d5ad78e7e5d08693b4cb17.zip
Qt-37fffc23dae8e10c89d5ad78e7e5d08693b4cb17.tar.gz
Qt-37fffc23dae8e10c89d5ad78e7e5d08693b4cb17.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
-rw-r--r--src/gui/statemachine/qguistatemachine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index eadb8ff..2a0de3c 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -404,6 +404,7 @@ static QEvent *cloneEvent(QEvent *e)
we2->setButtons(we->buttons());
we2->setModifiers(we->modifiers());
we2->setOrientation(we->orientation());
+ we2->setDelta(we->delta());
return we2;
}
#endif