summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/abstract3dcontroller.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-10-01 10:11:38 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-10-01 11:02:16 +0300
commit04aad082a33a51b8ab5563fb8ffb996b19e0e4ed (patch)
treed7bda05ab9839aa5e9e5e5011ad0764a6396f3d9 /src/datavisualization/engine/abstract3dcontroller.cpp
parentff512434c8272989ff08c027cccd1460f8808756 (diff)
Touch support update
Task-number: QTRD-2345 Change-Id: Ia6b6fd8d19cffcdfdba3aaab2bff0bbf941cf5a6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller.cpp')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp9
1 files changed, 0 insertions, 9 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,