From 86cc8bfa76061adfa29b48f80b426c6198de6a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 27 Jan 2014 06:50:42 +0200 Subject: iOS fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + texture power-of-two added + input handling changes - surface crashes, will be fixed in separate commit Task-number: QTRD-2802 Change-Id: I1913aec60c4e986b02f307d832dc55dea0be4348 Reviewed-by: Tomi Korpipää --- src/datavisualization/input/q3dinputhandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/input/q3dinputhandler.cpp') diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 17f5aee5..dcdb984e 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -88,7 +88,7 @@ Q3DInputHandler::~Q3DInputHandler() */ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos) { -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) Q_UNUSED(event); Q_UNUSED(mousePos); #else @@ -128,7 +128,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos) { Q_UNUSED(event); -#if defined (Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) Q_UNUSED(mousePos); #else if (QAbstract3DInputHandlerPrivate::InputStateRotating == d_ptr->m_inputState) { @@ -147,7 +147,7 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) { Q_UNUSED(event); -#if defined (Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) Q_UNUSED(mousePos); #else if (QAbstract3DInputHandlerPrivate::InputStateRotating == d_ptr->m_inputState) { -- cgit v1.2.3