diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-03-06 11:54:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 09:16:42 +0100 |
| commit | 638d9d3831357f80800a2fae4925f71648907f30 (patch) | |
| tree | 7eb12b5a1c657cac51a167468cc2c0dc1112add0 /src/plugins/platforms/android/src/qandroidplatformintegration.cpp | |
| parent | 5f25dc6be7e6a8f185d37884611123f7d3af7615 (diff) | |
Fix multi-touch input on Android
The touch events were collected but then thrown away because of
a missing port of he handleTouchEvent() function call.
Task-number: QTBUG-29126
Change-Id: I02f7380945be04a36da14a89f2f3ff9429b17cbc
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/src/qandroidplatformintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/android/src/qandroidplatformintegration.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp index 1091416ccc..cbd0f26835 100644 --- a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp @@ -84,8 +84,9 @@ void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteA } QAndroidPlatformIntegration::QAndroidPlatformIntegration(const QStringList ¶mList) + : m_touchDevice(0) #ifdef ANDROID_PLUGIN_OPENGL - : m_primaryWindow(0) + , m_primaryWindow(0) #endif { Q_UNUSED(paramList); @@ -179,6 +180,7 @@ QAndroidPlatformIntegration::~QAndroidPlatformIntegration() { delete m_androidPlatformNativeInterface; delete m_androidFDB; + delete m_touchDevice; QtAndroid::setAndroidPlatformIntegration(NULL); } QPlatformFontDatabase *QAndroidPlatformIntegration::fontDatabase() const |