diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-14 16:21:52 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-05 21:49:18 +0100 |
| commit | eb09b7aa75ee1b8c4c7d50315e6b6206b85f2822 (patch) | |
| tree | 79cd632c1f676a43f8ae353fca2d7af27a6233b3 /src/plugins/platforms/android | |
| parent | 73301b252a3486098d1e8d0dd4e36462d9ab5885 (diff) | |
Initial cleanup of qevent.h for Qt6
Takes care of the first round of todos and deprecations for Qt6 in
qevent.
Not touching anything that might interfere with changing the class
hierarchy as the file also suggest.
Change-Id: If72d63d8932f1af588785bf77b34532358639a63
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformintegration.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp index 56885f2e23..ff17f218e3 100644 --- a/src/plugins/platforms/android/androidjniinput.cpp +++ b/src/plugins/platforms/android/androidjniinput.cpp @@ -45,6 +45,7 @@ #include "qandroidplatformintegration.h" #include <qpa/qwindowsysteminterface.h> +#include <QTouchDevice> #include <QTouchEvent> #include <QPointer> diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 592b78d936..7f9fe1f05b 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -46,8 +46,9 @@ #if QT_CONFIG(opengl) #include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> #endif -#include <QThread> #include <QOffscreenSurface> +#include <QThread> +#include <QTouchDevice> #include <QtEglSupport/private/qeglpbuffer_p.h> #include <qpa/qwindowsysteminterface.h> |