diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-18 09:29:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 08:00:26 +0200 |
| commit | e32f1a4d61f0c55d066a43657ad607131be8ca34 (patch) | |
| tree | 81ea388722187e1650b2c2b2d9c22eafae5c0527 /src/android/jar/src/org/qtproject/qt5/android/QtNative.java | |
| parent | fdb956a3ede6cb0a25112c1e1af6c93fd2051de1 (diff) | |
| parent | ee2eed350f95285b65e3dd9647e5f366e16fd5a4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
And blacklisted a few tests in tst_QUdpSocket.
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtNative.java
src/corelib/global/qglobal.cpp
src/corelib/global/qsystemdetection.h
src/corelib/io/qfileselector.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
tests/auto/network/socket/qudpsocket/BLACKLIST
Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt5/android/QtNative.java')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index 48510b3fdf..04b8e6a06f 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -93,6 +93,7 @@ public class QtNative private static final int m_moveThreshold = 0; private static ClipboardManager m_clipboardManager = null; private static Method m_checkSelfPermissionMethod = null; + private static Boolean m_tabletEventSupported = null; private static final Runnable runPendingCppRunnablesRunnable = new Runnable() { @Override public void run() { @@ -385,6 +386,9 @@ public class QtNative { int pointerType = 0; + if (m_tabletEventSupported == null) + m_tabletEventSupported = isTabletEventSupported(); + switch (event.getToolType(0)) { case MotionEvent.TOOL_TYPE_STYLUS: pointerType = 1; // QTabletEvent::Pen @@ -395,7 +399,7 @@ public class QtNative // TODO TOOL_TYPE_MOUSE } - if (pointerType != 0) { + if (m_tabletEventSupported && pointerType != 0) { tabletEvent(id, event.getDeviceId(), event.getEventTime(), event.getAction(), pointerType, event.getButtonState(), event.getX(), event.getY(), event.getPressure()); } else { @@ -762,6 +766,7 @@ public class QtNative // pointer methods // tablet methods + public static native boolean isTabletEventSupported(); public static native void tabletEvent(int winId, int deviceId, long time, int action, int pointerType, int buttonState, float x, float y, float pressure); // tablet methods |