diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-04-19 19:52:37 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-04-24 12:10:49 +0000 |
commit | d58ec7629ba79058f8b7a27be3c6fb2947f5a017 (patch) | |
tree | eb352078ff46b8f130cc8501c10d3044193822df /src/datavisualization/input | |
parent | 73ec35fa12a4b150670ea93d3021ca8e658063e1 (diff) |
Fix build for -no-feature-wheelevent
Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/input')
4 files changed, 8 insertions, 0 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 85934482..5e6f10af 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -236,6 +236,7 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) #endif } +#if QT_CONFIG(wheelevent) /*! * Override this to change handling of wheel events. * The wheel event is given in the \a event. @@ -272,6 +273,7 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event) } } } +#endif /*! * \property Q3DInputHandler::rotationEnabled diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index f2028cd1..d606360b 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -61,7 +61,9 @@ public: virtual void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif Q_SIGNALS: void rotationEnabledChanged(bool enable); diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index d0ab00a1..2809bee3 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -135,6 +135,7 @@ void QAbstract3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &m Q_UNUSED(mousePos); } +#if QT_CONFIG(wheelevent) /*! * Override this to handle wheel events. * Wheel event is given in the \a event. @@ -143,6 +144,7 @@ void QAbstract3DInputHandler::wheelEvent(QWheelEvent *event) { Q_UNUSED(event); } +#endif // Property get/set /*! diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 753a34fa..c54138e3 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -68,7 +68,9 @@ public: virtual void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif InputView inputView() const; void setInputView(InputView inputView); |