summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-06-27 12:34:24 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-06-27 12:35:04 +0300
commitea8632d60ec48b5495c677b3a071450c4a66f11e (patch)
tree8cfeb085879fa69b5d250129400f1448c4321b4c
parent59291a5990ca95f707c689053cbee09326ecf840 (diff)
Android compilation fixes
Change-Id: I9ca347f4388b9a2b12dbfc4f1d13c35bc5bc4abb Change-Id: I9ca347f4388b9a2b12dbfc4f1d13c35bc5bc4abb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--examples/examples.pro2
-rw-r--r--src/datavis3d/engine/bars3drenderer.cpp12
2 files changed, 1 insertions, 13 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index d66a101e..f057b1c1 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -6,4 +6,4 @@ SUBDIRS += barchart \
qmlbarchart \
qmlmaps
-qtHaveModule(multimedia): SUBDIRS += spectrum
+qtHaveModule(multimedia):!android: SUBDIRS += spectrum
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 1e0297d5..23bdc32c 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -1515,18 +1515,6 @@ void Bars3dRenderer::drawScene(QDataSetPrivate *dataSet,
m_labelShader->release();
}
-#if defined(Q_OS_ANDROID)
-void Bars3dRenderer::mouseDoubleClickEvent(QMouseEvent *event)
-{
-
-}
-
-void Bars3dRenderer::touchEvent(QTouchEvent *event)
-{
-
-}
-#endif
-
void Bars3dRenderer::inspectSelectionAtPoint(const QPoint &point)
{
QMutexLocker locker(&m_mutex);