diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/android/src/androidjniinput.cpp | 15 | ||||
| -rw-r--r-- | src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp | 1 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/plugins/platforms/android/src/androidjniinput.cpp b/src/plugins/platforms/android/src/androidjniinput.cpp index b31e74bb52..4a2d87d6a4 100644 --- a/src/plugins/platforms/android/src/androidjniinput.cpp +++ b/src/plugins/platforms/android/src/androidjniinput.cpp @@ -222,24 +222,11 @@ namespace QtAndroidInput m_touchPoints.push_back(touchPoint); } - static void touchEnd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint action) + static void touchEnd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint /*action*/) { if (m_touchPoints.isEmpty()) return; - QEvent::Type eventType = QEvent::None; - switch (action) { - case 0: - eventType = QEvent::TouchBegin; - break; - case 1: - eventType = QEvent::TouchUpdate; - break; - case 2: - eventType = QEvent::TouchEnd; - break; - } - QAndroidPlatformIntegration *platformIntegration = QtAndroid::androidPlatformIntegration(); QTouchDevice *touchDevice = platformIntegration->touchDevice(); if (touchDevice == 0) { diff --git a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp index 5a35310111..c6e3035476 100644 --- a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp +++ b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp @@ -98,6 +98,7 @@ QDpi QEglFSAndroidHooks::logicalDpi() const EGLNativeWindowType QEglFSAndroidHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) { Q_UNUSED(size); + Q_UNUSED(format); ANativeWindow *window = QtAndroid::nativeWindow(); if (window != 0) ANativeWindow_acquire(window); |