diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-21 11:40:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-21 11:40:30 (GMT) |
| commit | 917fe59fbeeb8de04ede0242905eed87855b252d (patch) | |
| tree | a1559b3be8121a8bff691b20ca8e5ee10baf0f17 /src | |
| parent | 81c8759c23969dad0d300d844341379bfcd6611a (diff) | |
| parent | 95a9ab2d0e94c735ac813c809a4fe98dd466cc64 (diff) | |
| download | Qt-917fe59fbeeb8de04ede0242905eed87855b252d.zip Qt-917fe59fbeeb8de04ede0242905eed87855b252d.tar.gz Qt-917fe59fbeeb8de04ede0242905eed87855b252d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Wheel delta is always zero in QEventTransition's event
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/statemachine/qguistatemachine.cpp | 1 |
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 |