diff options
| author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 17:14:45 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 11:05:20 +0000 |
| commit | 1dc17c10c314fcc67bd52a9e8e79ab45eaff7dc6 (patch) | |
| tree | 468e864a04885f3cf7ed9a23e7c2fa7d0d89e185 | |
| parent | 78215d02a052ffc58cca109ef91fd531594375e9 (diff) | |
Fix build without feature.wheelevent
Change-Id: Ib78093b75f99a5b7b2589722f4706b75c2431c74
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index dc7b6b067..ce477a472 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -588,6 +588,7 @@ void QWaylandQuickItem::hoverLeaveEvent(QHoverEvent *event) } } +#if QT_CONFIG(wheelevent) /*! * \internal */ @@ -606,6 +607,7 @@ void QWaylandQuickItem::wheelEvent(QWheelEvent *event) event->ignore(); } } +#endif /*! * \internal diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 04f33db67..09f057adb 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -128,7 +128,9 @@ protected: void hoverEnterEvent(QHoverEvent *event) Q_DECL_OVERRIDE; void hoverMoveEvent(QHoverEvent *event) Q_DECL_OVERRIDE; void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; +#endif void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; |