diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-02 12:23:23 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-04 11:39:19 +0000 |
| commit | 0bde13f33e1f39783188b53bb4b2eef35c594303 (patch) | |
| tree | 9c150dd2c3d1b694fdac901c7494aafb6cfe55e3 /src/plugins/platforms/android/androidjniinput.h | |
| parent | 065527825e19a8a5eb2efa0ab481980dc86ad58a (diff) | |
Android: fix compiler warnings for Android input
QPointingDevice requires using the constructor to set its settings
in Qt 6.
Replace + with | operator and return QKeyCombination instead of int.
Change-Id: Id3da469cc13b34ec7b55afa751dbc04601880df6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 4493b90224f575e5570afeb1ec181be5c4e74b09)
Diffstat (limited to 'src/plugins/platforms/android/androidjniinput.h')
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.h b/src/plugins/platforms/android/androidjniinput.h index cc3070c4aa..9e75f43a83 100644 --- a/src/plugins/platforms/android/androidjniinput.h +++ b/src/plugins/platforms/android/androidjniinput.h @@ -58,7 +58,8 @@ namespace QtAndroidInput // Software keyboard support // cursor/selection handles - void updateHandles(int handleCount, QPoint editMenuPos = QPoint(), uint32_t editButtons = 0, QPoint cursor = QPoint(), QPoint anchor = QPoint(), bool rtl = false); + void updateHandles(int handleCount, QPoint editMenuPos = QPoint(), uint32_t editButtons = 0, + QPoint cursor = QPoint(), QPoint anchor = QPoint(), bool rtl = false); bool registerNatives(JNIEnv *env); } |