summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-098-108/+107
|\
| * Revert "Android: Implement MaximizeUsingFullscreenGeometryHint"Eskil Abrahamsen Blomfeldt2020-01-078-108/+107
* | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-041-16/+59
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-161-16/+59
| |\
| | * Initialize all variablesBogDan Vatra2019-12-031-2/+3
| | * Fix assets iteratorBogDan Vatra2019-11-291-14/+56
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-258-107/+108
|\ \ \ | |/ /
| * | Android: Implement MaximizeUsingFullscreenGeometryHintEskil Abrahamsen Blomfeldt2019-11-088-107/+108
| |/
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-263-19/+0
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-243-19/+0
| |\
| | * Revert "Release left button before showing the popup context menu"Eskil Abrahamsen Blomfeldt2019-10-213-19/+0
* | | Fix duplicate platform plugin definitionsSimon Hausmann2019-10-163-65/+1
|/ /
* | Android: Do not extract QML assets dataBogDan Vatra2019-10-021-0/+5
* | Android: rework assets supportBogDan Vatra2019-10-024-192/+184
* | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-301-3/+2
|\ \ | |/
| * Move DialogButtonBoxLayout case to be before MouseDoubleClickDistanceAndy Shaw2019-09-241-3/+2
* | Avoid unused parameter 'grab' warningsLiang Qi2019-09-231-2/+2
* | Android: Fix loading of pluginsBogDan Vatra2019-09-223-7/+66
* | Android: Fix cmake generatorBogDan Vatra2019-09-071-4/+0
* | Update Dpi and scale factor computationMorten Johan Sørvig2019-08-232-4/+6
* | Android: Fix env vars parsingBogDan Vatra2019-08-191-3/+3
* | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-08-135-12/+88
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-125-12/+88
| |\
| | * Android: Fix QMenu on 64 bitEskil Abrahamsen Blomfeldt2019-08-085-12/+88
* | | Port some trivial cases from QMutex to QRecursiveMutexMarc Mutz2019-07-061-2/+2
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-012-3/+29
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-291-3/+27
| |\ \ | | |/
| | * QAndroidInputContext: Generate a QInputMethodEvent in reset()Vova Mshanetskiy2019-06-281-0/+1
| | * QAndroidInputContext: Do not stop composing when user taps the cursorVova Mshanetskiy2019-06-281-1/+19
| | * QAndroidInputContext: Consider preedit text in getCursorCapsMode()Vova Mshanetskiy2019-06-281-2/+7
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-281-0/+2
| |\ \ | | |/
| | * Android: Use Android button layout for the DialogButtonBoxLayout hintAndy Shaw2019-06-181-0/+2
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-202-244/+501
| |\ \ | | |/
* | | Optimize some atomic countersMarc Mutz2019-06-271-2/+3
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-06-252-244/+501
|\ \ \ | | |/ | |/|
| * | QAndroidInputContext: Improve compatibility with virtual keyboardsVova Mshanetskiy2019-06-052-202/+430
| * | QAndroidInputContext: Don't allow clearing selection by dragging handlesVova Mshanetskiy2019-06-051-39/+27
| * | QAndroidInputContext: Fix unneeded preedit commits when dragging handlesVova Mshanetskiy2019-06-051-11/+52
* | | Port from QAtomic::load() to loadRelaxed()Giuseppe D'Angelo2019-06-203-4/+4
* | | Merge remote-tracking branch 'origin/5.13' into devFriedemann Kleint2019-05-271-30/+49
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Friedemann Kleint2019-05-271-30/+49
| |\ \ | | |/
| | * QAndroidInputContext: Fix getTextBefore/AfterCursor() in mid. of preeditVova Mshanetskiy2019-05-081-30/+47
| | * QAndroidInputContext: Fix most "Input method out of sync" warningsVova Mshanetskiy2019-05-131-0/+2
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-05-151-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-121-1/+1
| |\ \ | | |/
| | * QAndroidInputContext: Fix start value of Cursor attribute in longPress()Vova Mshanetskiy2019-05-101-1/+1
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-05-071-4/+22
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-061-4/+22
| |\ \ | | |/
| | * Android: Fix deleting of new lines when using backspaceAndy Shaw2019-05-031-4/+22
* | | Prefix textstream operators with Qt::Lars Knoll2019-05-021-1/+1