diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:16:24 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:16:51 +0100 |
| commit | 7830710e57cbbbc8a2fb37fc97eb99f552ecdd83 (patch) | |
| tree | 3fe141b7921ec3820c1db13fe1827c051e8f5060 /src/quick/items/qquickmousearea_p.h | |
| parent | 0beb478b7f4c50f6b57cdc164ffe8029d2895149 (diff) | |
| parent | d37547add0369d45182271754c0a35032d7de2d3 (diff) | |
Merge branch 'stable' into release
Change-Id: I44631ce9d9a6aba090d01911ff62b56043510c9c
Diffstat (limited to 'src/quick/items/qquickmousearea_p.h')
| -rw-r--r-- | src/quick/items/qquickmousearea_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index eb5bddf1db..c2138792ae 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -222,7 +222,9 @@ protected: virtual void hoverEnterEvent(QHoverEvent *event); virtual void hoverMoveEvent(QHoverEvent *event); virtual void hoverLeaveEvent(QHoverEvent *event); +#ifndef QT_NO_WHEELEVENT virtual void wheelEvent(QWheelEvent *event); +#endif virtual bool childMouseEventFilter(QQuickItem *i, QEvent *e); virtual void timerEvent(QTimerEvent *event); virtual void windowDeactivateEvent(); |