summaryrefslogtreecommitdiffstats
path: root/src/tools/androiddeployqt
Commit message (Collapse)AuthorAgeFilesLines
* Android: Copy extra libs in aux modeBogDan Vatra2019-05-021-0/+2
| | | | | Change-Id: Ibbdd6b9c23c094923bc60a8a013f3ac356444510 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Revert "androiddeployqt: Do not check for stdcpp-path in auxiliary mode"BogDan Vatra2019-04-251-1/+1
| | | | | | | | | stdcpp-path is needed to set the correct stdc++ library in libs.xml file. This reverts commit 1366c4f04645d74e83847687adcf61ecfa20b3d2. Change-Id: I79b398c5d97c1e98bf503ef7b95b2e9f0f18bc11 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-1/+1
|\ | | | | | | Change-Id: I5f9d8090a07056411fb65d7de60eb679d00e99a3
| * Merge 5.12 into 5.12.2Kari Oikarinen2019-02-201-3/+12
| |\ | | | | | | | | | Change-Id: I3a5721aebd3afd8fa08d3f3df6bf61502fa9c347
| * | androiddeployqt: Do not check for stdcpp-path in auxiliary modeChristian Kandeler2019-02-181-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QBS-1429 Change-Id: I189bc42fdee5e63f55705084247fbfc4448a6b65 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | androiddeployqt: Also shellquote rootPath as part of importPathsUlf Hermann2019-03-141-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-74212 Change-Id: Ie0c9b5b230e93e50d6e636a6105c3bd717715374 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Add translatable attribute to the app_name string to fix a lint warningLars Schmertmann2019-02-201-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Incomplete translation ---------------------- If an application has more than one locale, then all the strings declared in one language should also be translated in all other languages. If the string should not be translated, you can add the attribute translatable="false" on the <string> element, or you can define all your non-translatable strings in a resource file called donottranslate.xml. Or, you can ignore the issue with a tools:ignore="MissingTranslation" attribute. Change-Id: I6f93f34fc36a06de9a0b687a93cf58df941dbbcb Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Kludge popen/pclose calls on MS-WinDmitry Sokolov2019-02-191-3/+12
|/ | | | | | | | | For MS Visual Studio we need to use _popen() and _pclose() instead of the POSIX functions; and the pipe needs to be opened in binary mode. Change-Id: Ide0fb26a1e5f121b384b0baaf8100f26c614ccc6 Fixes: QTBUG-73810 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-061-1/+1
|\ | | | | | | Change-Id: I486f3c51df4b60fe60b75ba642636a835a75f731
| * Fix llvm-strip errorv5.12.1BogDan Vatra2019-01-281-1/+1
| | | | | | | | | | | | | | | | | | In NDKr19 they removed "-strip-all-gnu" argument, now llvm-strip prints tons of: .../llvm-strip: error: unknown argument '-strip-all-gnu'. Change-Id: I11bb2d6abcc5f236730c57b5b93cc932c7ba58c6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | qmake: Add variables for setting the version number and name in AndroidAndy Shaw2019-02-041-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it much easier to have the version information set for an Android APK without having to manually modify the AndroidManifest.xml each time. [ChangeLog][Android][qmake] Can now set the version name and code for Android using ANDROID_VERSION_NAME and ANDROID_VERSION_CODE respectively in the pro file. Change-Id: Ie6813bc3a7444f7baa5e772b93bc2695d9b81e57 Done-with: Markus Maier <markus.maier@rosenberger.de> Reviewed-by: Markus Maier <markus.maier@rosenberger.de> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Add the command line option --no-strip to androiddeployqtJoerg Bornemann2019-01-161-0/+6
|/ | | | | | | | | | | | | There are certain use cases for keeping debug information on the device, for example collecting stack traces when the app crashes. [ChangeLog][Android] Added the --no-strip command line option to androiddeployqt. Change-Id: I96574c2c57d85fb23d5fc65380e471fa892b6543 Fixes: QTBUG-57771 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: Prepare for the worst, when the NDK will remove all GNU toolsBogDan Vatra2018-11-191-38/+59
| | | | | | | | | | | | | In NDKr18 Google removed GCC, most probably the massacre will not end there and they will remove all GNU tools, so we need to start using LLVM ones. This patch still keeps the compatibility with GNU tools if the Qt was built with android-g++ mkspec. Change-Id: Ibe1979577e08ce63604d55fc5bbd5f64b3737675 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: Make sure that the path is using / for separatorsAndy Shaw2018-11-121-1/+1
| | | | | | | | When passing \ to Gradle it will strip these out, so by using / it ensures that it is able to find the Android SDK directory fine. Change-Id: I053f087438ade6c30d015abe00e9958beb90a947 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* androiddeployqt: Add auxiliary modeChristian Kandeler2018-08-211-0/+23
| | | | | | | | | | | In this mode, library and other dependencies are copied into the build directory, and the XML templates in the build directory are updated accordingly, but the project is not built or installed. Needed by qbs. No existing code has been touched. Change-Id: Ib8015f7c2315b39dfb21750fecc8618bce03cb8c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Look for dependency XML files in all prefix pathsVolker Krause2018-08-071-2/+7
| | | | | | | | src/tools/androiddeployqt/main.cpp was moved from qttools into qtbase in 5.11. So re-apply 07bc7c02 in qttools here. Change-Id: I13a77a0c8567d07c4aa6369ed76bdb894b88f86f Reviewed-by: Volker Krause <volker.krause@kdab.com>
* Add support for additional prefix pathsVolker Krause2018-08-071-7/+24
| | | | | | | | | | | | | | That is, paths that are searched for dependencies too, next to the Qt install prefix. So far this only covers library dependencies, dependency meta data or QML imports are subject to subsequent patches. src/tools/androiddeployqt/main.cpp was moved from qttools into qtbase in 5.11. So re-apply 14013829 in qttools here. Change-Id: I5649e518cfa3deeac429b4142e6292cb514ef104 Reviewed-by: Volker Krause <volker.krause@kdab.com>
* Fix apkPath for gradle 4.0+BogDan Vatra2018-08-071-3/+8
| | | | | | | | | | | This change keeps the compatibility with old gradle. It is needed for projects that must use the old gradle version. src/tools/androiddeployqt/main.cpp was moved from qttools into qtbase in 5.11. So re-apply c03f5673 in qttools here. Change-Id: Iaa669c6bf12277cb0cde422228a5c653b6bcf433 Reviewed-by: Volker Krause <volker.krause@kdab.com>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
* Move androiddeployqt to qtbaseJan Arve Sæther2018-06-212-0/+2923
androiddeploytqt is the only official way of deploying applications to the device, so it is therefore part of the "platform". It therefore needs to live in qtbase. Change-Id: I52d7c4427275aacec792b71284a0c10edaf7ab69 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:21:47 +0000