summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-04-19 19:52:37 +0200
committerStephan Binner <stephan.binner@basyskom.com>2017-04-24 12:10:49 +0000
commitd58ec7629ba79058f8b7a27be3c6fb2947f5a017 (patch)
treeeb352078ff46b8f130cc8501c10d3044193822df /src
parent73ec35fa12a4b150670ea93d3021ca8e658063e1 (diff)
Fix build for -no-feature-wheelevent
Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp2
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h2
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.cpp2
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.h2
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp2
-rw-r--r--src/datavisualization/input/q3dinputhandler.h2
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.cpp2
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.h2
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp2
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h2
10 files changed, 20 insertions, 0 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index adfe461e..02a435aa 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -589,11 +589,13 @@ void Abstract3DController::mouseMoveEvent(QMouseEvent *event, const QPoint &mous
m_activeInputHandler->mouseMoveEvent(event, mousePos);
}
+#if QT_CONFIG(wheelevent)
void Abstract3DController::wheelEvent(QWheelEvent *event)
{
if (m_activeInputHandler)
m_activeInputHandler->wheelEvent(event);
}
+#endif
void Abstract3DController::handleThemeColorStyleChanged(Q3DTheme::ColorStyle style)
{
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 4f65d427..56b7a45e 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -338,7 +338,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
virtual void handleAxisTitleChangedBySender(QObject *sender);
virtual void handleAxisLabelsChangedBySender(QObject *sender);
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index dfedacd0..cb09082e 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -1029,6 +1029,7 @@ void QAbstract3DGraph::mouseMoveEvent(QMouseEvent *event)
d_ptr->m_visualController->mouseMoveEvent(event, event->pos());
}
+#if QT_CONFIG(wheelevent)
/*!
* \internal
*/
@@ -1036,6 +1037,7 @@ void QAbstract3DGraph::wheelEvent(QWheelEvent *event)
{
d_ptr->m_visualController->wheelEvent(event);
}
+#endif
QAbstract3DGraphPrivate::QAbstract3DGraphPrivate(QAbstract3DGraph *q)
: QObject(0),
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 87c93f5f..a7d7d2ac 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -206,7 +206,9 @@ protected:
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
+#if QT_CONFIG(wheelevent)
void wheelEvent(QWheelEvent *event);
+#endif
Q_SIGNALS:
void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
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);
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 7568fd30..9c7a7238 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -656,10 +656,12 @@ void AbstractDeclarative::mouseMoveEvent(QMouseEvent *event)
m_controller->mouseMoveEvent(event, mousePos);
}
+#if QT_CONFIG(wheelevent)
void AbstractDeclarative::wheelEvent(QWheelEvent *event)
{
m_controller->wheelEvent(event);
}
+#endif
void AbstractDeclarative::checkWindowList(QQuickWindow *window)
{
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 1a9c4e81..f49da398 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -250,7 +250,9 @@ protected:
virtual void mousePressEvent(QMouseEvent *event);
virtual void mouseReleaseEvent(QMouseEvent *event);
virtual void mouseMoveEvent(QMouseEvent *event);
+#if QT_CONFIG(wheelevent)
virtual void wheelEvent(QWheelEvent *event);
+#endif
virtual void handleWindowChanged(QQuickWindow *win);
virtual void itemChange(ItemChange change, const ItemChangeData &value);
virtual void updateWindowParameters();