diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:37:40 +0200 |
commit | 53fcf914e278ed4395a4873af2b64272c5d7882c (patch) | |
tree | 6394dc7e3dffe2f8a93b0bf48610016c7917e905 /src/datavisualization/input | |
parent | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (diff) | |
parent | 9546547495582628ba815a7d99e621d11ca84fa1 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I363b4779fe630b7956f6582ac3821d4ea8ee34c8
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); |