summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-291-2/+2
|\
| * Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-01-281-2/+2
| |\
| | * Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-241-2/+2
* | | Regenerate plugin projects to get new target namesAlexandru Croitor2020-01-272-12/+12
* | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-241-16/+59
|\| |
| * | 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/dev' into wip/cmakeLeander Beernaert2019-11-193-19/+0
|\| |
| * | 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
* | | | Regenerate src/*Alexandru Croitor2019-11-142-8/+8
* | | | Regenerate everything under ./srcAlexandru Croitor2019-11-122-2/+0
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 17:08:26 +0000