8 files changed, 3 insertions, 26 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 61c9115a..8d190f48 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -26,12 +26,7 @@
 #include "q3dlight.h"
 #include "qabstractdataproxy_p.h"
 #include "qabstract3dinputhandler_p.h"
-
-#if defined(Q_OS_ANDROID)
 #include "qtouch3dinputhandler.h"
-#else
-#include "q3dinputhandler.h"
-#endif
 
 #include <QThread>
 
@@ -66,11 +61,7 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
 
     // Create initial default input handler
     QAbstract3DInputHandler *inputHandler;
-#if defined(Q_OS_ANDROID)
     inputHandler = new QTouch3DInputHandler();
-#else
-    inputHandler = new Q3DInputHandler();
-#endif
     inputHandler->d_ptr->m_isDefaultHandler = true;
     setActiveInputHandler(inputHandler);
     connect(inputHandler, &QAbstract3DInputHandler::inputStateChanged, this,
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index a4b93840..d99ece1a 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -110,7 +110,6 @@ Q3DBars::~Q3DBars()
 {
 }
 
-#if defined(Q_OS_ANDROID)
 /*!
  * \internal
  */
@@ -126,7 +125,6 @@ void Q3DBars::touchEvent(QTouchEvent *event)
 {
     d_ptr->m_shared->touchEvent(event);
 }
-#endif
 
 /*!
  * \internal
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 078100a1..e4c1d785 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -125,10 +125,8 @@ signals:
 
 protected:
 
-#if defined(Q_OS_ANDROID)
     void mouseDoubleClickEvent(QMouseEvent *event);
     void touchEvent(QTouchEvent *event);
-#endif
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 8e7a9a23..5780fcda 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -80,7 +80,7 @@ private:
     friend class Scatter3DRenderer;
     friend class SelectionPointer;
     friend class Q3DInputHandler;
-    friend class QTouch3DInputHandler;
+    friend class QTouch3DInputHandlerPrivate;
     friend class QMac3DInputHandler;
 };
 
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index 28c453e3..816849fe 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -101,7 +101,6 @@ Q3DScatter::~Q3DScatter()
 {
 }
 
-#if defined(Q_OS_ANDROID)
 /*!
  * \internal
  */
@@ -117,7 +116,6 @@ void Q3DScatter::touchEvent(QTouchEvent *event)
 {
     d_ptr->m_shared->touchEvent(event);
 }
-#endif
 
 /*!
  * \internal
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index 8fa3eae4..33e74d7d 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -112,11 +112,8 @@ signals:
     void selectedItemIndexChanged(int index);
 
 protected:
-
-#if defined(Q_OS_ANDROID)
     void mouseDoubleClickEvent(QMouseEvent *event);
     void touchEvent(QTouchEvent *event);
-#endif
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index bc6e4bca..467fbc1c 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -111,13 +111,12 @@ Q3DSurface::~Q3DSurface()
 {
 }
 
-#if defined(Q_OS_ANDROID)
 /*!
  * \internal
  */
 void Q3DSurface::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event)
+    d_ptr->m_shared->mouseDoubleClickEvent(event);
 }
 
 /*!
@@ -125,9 +124,8 @@ void Q3DSurface::mouseDoubleClickEvent(QMouseEvent *event)
  */
 void Q3DSurface::touchEvent(QTouchEvent *event)
 {
-    Q_UNUSED(event)
+    d_ptr->m_shared->touchEvent(event);
 }
-#endif
 
 /*!
  * \internal
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index c0edd6d7..957234b7 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -98,11 +98,8 @@ public:
     QDataVis::LabelTransparency labelTransparency() const;
 
 protected:
-
-#if defined(Q_OS_ANDROID)
     void mouseDoubleClickEvent(QMouseEvent *event);
     void touchEvent(QTouchEvent *event);
-#endif
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);