summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
Commit message (Expand)AuthorAgeFilesLines
* Add custom targets to generate Android APKLeander Beernaert2019-10-231-3/+3
* Re-generate affected cmake files and configure.json after the mergeSimon Hausmann2019-10-172-2/+0
* Merge remote-tracking branch 'origin/dev' into wip/cmakeSimon Hausmann2019-10-173-65/+1
|\
| * Fix duplicate platform plugin definitionsSimon Hausmann2019-10-163-65/+1
* | Regenerate files after dev -> wip/cmake mergeAlexandru Croitor2019-10-142-8/+4
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-147-206/+257
|\|
| * 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
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-118-19/+97
|\| |
| * | 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
* | | | Regenerate platforms plugins part 4Alexandru Croitor2019-10-082-3/+93
* | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-117-253/+537
|\| | |
| * | | 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
* | | | cmake: implement default qpa plugin behavior for static buildsJean-Michaël Celerier2019-07-051-0/+1
* | | | Android: Correct install path for libqtforandroid.soLeander Beernaert2019-06-131-3/+3
* | | | Correct install path for QtForAndroid pluginLeander Beernaert2019-06-131-0/+8
* | | | Add the Android QPA plugin to the CMake buildSimon Hausmann2019-06-052-2/+94
|/ / /
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 03:23:17 +0000