diff options
Diffstat (limited to 'src/android')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 6 | ||||
-rw-r--r-- | src/android/templates/res/values/libs.xml | 2 |
2 files changed, 5 insertions, 3 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 b7d1217e98..b6dbd82597 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -422,7 +422,9 @@ public class QtNative i == 0, (int)event.getX(i), (int)event.getY(i), - event.getSize(i), + event.getTouchMajor(i), + event.getTouchMinor(i), + event.getOrientation(i), event.getPressure(i)); } @@ -790,7 +792,7 @@ public class QtNative public static native void mouseUp(int winId, int x, int y); public static native void mouseMove(int winId, int x, int y); public static native void touchBegin(int winId); - public static native void touchAdd(int winId, int pointerId, int action, boolean primary, int x, int y, float size, float pressure); + public static native void touchAdd(int winId, int pointerId, int action, boolean primary, int x, int y, float major, float minor, float rotation, float pressure); public static native void touchEnd(int winId, int action); public static native void longPress(int winId, int x, int y); // pointer methods diff --git a/src/android/templates/res/values/libs.xml b/src/android/templates/res/values/libs.xml index 77f422cfb2..4009a7785a 100644 --- a/src/android/templates/res/values/libs.xml +++ b/src/android/templates/res/values/libs.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <resources> <array name="qt_sources"> - <item>https://download.qt.io/ministro/android/qt5/qt-5.8</item> + <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item> </array> <!-- The following is handled automatically by the deployment tool. It should |