diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-04-18 13:34:28 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-04-19 08:34:59 +0000 |
| commit | e4042e3cee4b84748f36609abee6555594a61afb (patch) | |
| tree | da3917c38ed7081f622a1bd52f47ca5d00a4c276 | |
| parent | 9e12ec43e9490651f43f9ae9ff1c3e3bb4834754 (diff) | |
| download | qtlocation-e4042e3cee4b84748f36609abee6555594a61afb.tar.gz | |
Fix build for -no-feature-wheelevent
Change-Id: I69246dcaeda841892b1efe182725629517031447
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
4 files changed, 10 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 1638d1c8..f196af04 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1545,6 +1545,7 @@ void QDeclarativeGeoMap::touchEvent(QTouchEvent *event) } } +#if QT_CONFIG(wheelevent) /*! \internal */ @@ -1556,6 +1557,7 @@ void QDeclarativeGeoMap::wheelEvent(QWheelEvent *event) QQuickItem::wheelEvent(event); } +#endif bool QDeclarativeGeoMap::isInteractive() { diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h index f08998e2..32e892c2 100644 --- a/src/location/declarativemaps/qdeclarativegeomap_p.h +++ b/src/location/declarativemaps/qdeclarativegeomap_p.h @@ -214,7 +214,9 @@ protected: void mouseUngrabEvent() Q_DECL_OVERRIDE ; void touchUngrabEvent() Q_DECL_OVERRIDE; void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE ; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE ; +#endif bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE; bool sendMouseEvent(QMouseEvent *event); diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp index 992fa21e..c28c2a28 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp +++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp @@ -41,7 +41,9 @@ #include <QtGui/QGuiApplication> #include <QtGui/qevent.h> +#if QT_CONFIG(wheelevent) #include <QtGui/QWheelEvent> +#endif #include <QtGui/QStyleHints> #include <QtQml/qqmlinfo.h> #include <QtQuick/QQuickWindow> @@ -940,6 +942,7 @@ void QQuickGeoMapGestureArea::handleTouchEvent(QTouchEvent *event) update(); } +#if QT_CONFIG(wheelevent) void QQuickGeoMapGestureArea::handleWheelEvent(QWheelEvent *event) { if (!m_map) @@ -958,6 +961,7 @@ void QQuickGeoMapGestureArea::handleWheelEvent(QWheelEvent *event) event->accept(); } +#endif /*! \internal diff --git a/src/location/declarativemaps/qquickgeomapgesturearea_p.h b/src/location/declarativemaps/qquickgeomapgesturearea_p.h index 320c0fbe..5daa39cf 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea_p.h +++ b/src/location/declarativemaps/qquickgeomapgesturearea_p.h @@ -163,7 +163,9 @@ public: void setFlickDeceleration(qreal deceleration); void handleTouchEvent(QTouchEvent *event); +#if QT_CONFIG(wheelevent) void handleWheelEvent(QWheelEvent *event); +#endif void handleMousePressEvent(QMouseEvent *event); void handleMouseMoveEvent(QMouseEvent *event); void handleMouseReleaseEvent(QMouseEvent *event); |