summaryrefslogtreecommitdiffstats
path: root/src/tools/androiddeployqt
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-241-6/+19
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-131-0/+1
| |\
| | * AAB files can be signed only with jarsigner toolBogDan Vatra2020-01-091-0/+1
| * | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-041-9/+10
| |\|
| | * Support both qrc and qml files for qmlimportscannerMichael Dippold2019-12-111-9/+10
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-251-12/+23
| |\|
| | * Add support for passing qrc files to qmlimportscannerAndy Shaw2019-11-131-12/+23
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-191-1/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-271-1/+1
| |\|
| | * Fix bundled_libs section from libs.xmlBogDan Vatra2019-10-251-1/+1
* | | Regenerate src/*Alexandru Croitor2019-11-142-4/+4
* | | Regenerate everything under ./srcAlexandru Croitor2019-11-122-2/+0
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-103/+81
|\| |
| * | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2019-10-041-106/+82
| |\|
| | * Android: Do not extract QML assets dataBogDan Vatra2019-10-021-97/+71
| | * Android: Fix plugins namingBogDan Vatra2019-10-011-9/+11
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-061-1/+3
| |\|
| | * Android: Fix architecture extraction from file path in androiddeployqtAlexandru Croitor2019-09-031-1/+3
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-580/+563
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-09-031-42/+71
| |\|
| | * Add support for aabBogDan Vatra2019-09-021-42/+71
| * | Add support to override Qml Import Scanner binary to androiddeployqtLeander Beernaert2019-08-301-2/+23
| |/
| * Use QLatin1String where possibleBogDan Vatra2019-08-281-115/+114
| * Say hello to Android multi arch build in one goBogDan Vatra2019-08-261-494/+428
* | Regenerate tools projectsAlexandru Croitor2019-10-082-1/+30
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-111-128/+29
|\|
| * Run prebuilt android test APKsBogDan Vatra2019-06-131-1/+20
| * Android: Nuke ant supportBogDan Vatra2019-06-061-127/+9
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-141-2/+17
|\|
| * Convert the one extant use of QTime as a timer to use a local classEdward Welbourne2019-05-241-2/+17
* | Android: SDK SupportLeander Beernaert2019-06-051-0/+27
|/
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/stagin...Liang Qi2019-05-031-0/+2
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-031-0/+2
| |\
| | * Android: Copy extra libs in aux modeBogDan Vatra2019-05-021-0/+2
* | | androiddeployqt: print qmlimportscanner command in verbose modeMitch Curtis2019-05-031-0/+5
|/ /
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-261-1/+1
|\|
| * Revert "androiddeployqt: Do not check for stdcpp-path in auxiliary mode"BogDan Vatra2019-04-251-1/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-201-1/+1
|\|
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-1/+1
| |\
| | * Merge 5.12 into 5.12.2Kari Oikarinen2019-02-201-3/+12
| | |\
| | * | androiddeployqt: Do not check for stdcpp-path in auxiliary modeChristian Kandeler2019-02-181-1/+1
* | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-151-1/+1
|\| | |
| * | | androiddeployqt: Also shellquote rootPath as part of importPathsUlf Hermann2019-03-141-1/+1
* | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-211-4/+13
|\| | |
| * | | Add translatable attribute to the app_name string to fix a lint warningLars Schmertmann2019-02-201-1/+1
| | |/ | |/|
| * | Kludge popen/pclose calls on MS-WinDmitry Sokolov2019-02-191-3/+12
| |/
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-02-081-1/+23
|\|
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-061-1/+1
| |\
| | * Fix llvm-strip errorv5.12.1BogDan Vatra2019-01-281-1/+1
| * | qmake: Add variables for setting the version number and name in AndroidAndy Shaw2019-02-041-0/+22