summaryrefslogtreecommitdiffstats
path: root/src/tools/androiddeployqt/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Copy only files that belongs to QML moduleAlexey Edelev2021-12-201-20/+51
| | | | | | | | | | | Instead of copying all files that the QML module directory contains, this approach only copies files that belong to the QML module according to the qmlimportscanner output. Pick-to: 6.3 Fixes: QTBUG-97834 Change-Id: I881a6fba28ca24be4f33de8693b41b6dfefe8d6b Reviewed-by: Ulf Hermann <[email protected]>
* androiddeployqt: Fix signing of paths with spacesKai Köhne2021-12-031-21/+24
| | | | | | | | | | Only use shellQuote() if the path is actually passed to a native API. For QFile API, use the unquoted path. Fixes: QTBUG-97649 Pick-to: 5.15 6.2 Change-Id: I9d8131819010bbd2faa8a81eef367245d90a767f Reviewed-by: Assam Boudjelthia <[email protected]>
* Use depfile to control ABI-specific builds of executable targetsAlexey Edelev2021-12-021-4/+13
| | | | | | | | | | | | | qt_internal_${target}_copy_apk_dependencies should use CMake DEPFILE approach when it's possible. Since we don't have any specific artifact that androiddeployqt can produce when collecting dependencies this change adds simple timestamp file that is touched each time when androiddeployqt is running. The timestamp is used then as a file-level dependency for the qt_internal_${target}_copy_apk_dependencies target. Task-number: QTBUG-88841 Change-Id: I985535c7b6e471cb4cfbf90128628087dadc72d0 Reviewed-by: Alexandru Croitor <[email protected]>
* Change the external projects approach for multi-abi buildsAlexey Edelev2021-12-021-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of generating external projects that build the project tree for each target, this creates a single project for each ABI that have the common for all targets configure steps. Each executable target then adds additional build step to each ABI-specific external project, that builds and copies dependencies to the "main" project build tree. To resolve dependencies from the build tree, when building multi-abi apk instead of scanning the build directories of external projects for dependencies, it makes sense to run androiddeployqt for each ABI-specific external project to copy all necessary libraries. This is done by adding --copy-dependencies-only flag to androiddeployqt that only copies the apk dependencies, but avoids creating apk and all the essential steps. The ABI-specific external project now handles the deploying of the build artifacts to the end-point apk deployment directory and the "main" project assembles the apk using collected artifacts. The ABI-specific external project uses the qt_internal_${target}_copy_apk_dependencies target to run androiddeployqt with the introduced --copy-dependencies-only flag. TODO: Build steps that build and copy the ABI-specific apk dependencies are non-skipable and will run each time top-level build is triggered. This behavior should be fixed by adding dependencies to the generated by androiddeployqt DEPFILES for each ABI in the top-level build. Task-number: QTBUG-88841 Tash-number: QTBUG-94714 Change-Id: Id442a9fbd589f58b70f4204c5215645056b379a2 Reviewed-by: Alexandru Croitor <[email protected]>
* Add --no-rcc-bundle-cleanup option to androiddeployqt toolAlexey Edelev2021-10-291-2/+13
| | | | | | | | | | | Add --no-rcc-bundle-cleanup option to androiddeployqt tool that helps to debug android build procedures and check the raw rcc bundle for missing items. Also add the QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP CMake variable that adds the option when configuring projects for Android. Change-Id: I1f30ba979f9fb3274e44a53fdc5ebde4e65f0843 Reviewed-by: Assam Boudjelthia <[email protected]>
* Replace deleteRecursively function with QDir::removeRecursivelyAlexey Edelev2021-10-291-18/+1
| | | | | | | | | Use QDir::removeRecursively instead of deleteRecursively when cleaning up top-level build folders. Change-Id: Ifb406fc1965a0781eab4fd63a3764a84f4309d25 Reviewed-by: Assam Boudjelthia <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* Android: replace ndk.dir with android.ndkVersion in build.gradleAssam Boudjelthia2021-10-131-3/+14
| | | | | | | | | | | | The use of ndk.dir in local.properties is deprecated in favor of android.ndkVersion in build.gradle, and will be totatlly removed in the future, so we need to adapt to that. Fixes: QTBUG-91391 Pick-to: 6.2 Change-Id: I54c57113a759d43c3685c9cdf2b9dcc5c948c0fd Reviewed-by: BogDan Vatra <[email protected]> Reviewed-by: Rami Potinkara <[email protected]>
* androiddeployqt: Use QElapsedTimer to get elapsed timeFabian Kosmale2021-10-081-33/+18
| | | | | | | | | No need to reinevent the wheel. Also, use nanoseconds now that we have the precision available. Change-Id: I287d06198edc3f5bdf7f85bd5f3e235b1fea95a3 Reviewed-by: Assam Boudjelthia <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* androiddeployqt: only write enabled architectures to build.gradleAndreas Buhr2021-10-041-0/+2
| | | | | | | | | | androiddeployqt writes a list of architectures into the build.gradle file. This list should only contain the architectures which are enabled. This patch adapts the generation of this list accordingly. Amends 07cfab07a2a489e021b56226824a2d9b1211fad7. Change-Id: I5c7c1886c54cc3b9a7e42af6eefbaf2a067a67d5 Reviewed-by: Assam Boudjelthia <[email protected]>
* androiddeployqt: Allow to also provide multiple qt install directoriesRaphael Cotty2021-10-011-17/+91
| | | | | | | | | | | | | | | | | | The "qt" property can also be filled with a json object like this: "qt": { "x86":"/home/.../Qt/6.3.0/android_x86", "x86_64":"/home/.../Qt/6.3.0/android_x86_64", "arm64-v8a":"/home/.../Qt/6.3.0/android_arm64_v8a", "armeabi-v7a":"/home/.../Qt/6.3.0/android_armv7"} That allows to update the options.qtInstallDirectory when changing the current architecture. The "qtHostDir" property is also added to provide the path to the qt host installation (rcc, qmlimportscanner). Change-Id: I3f0c36cc7a7030d45adc1a4dccaaad61dd538aea Task-number: QTBUG-88841 Reviewed-by: Assam Boudjelthia <[email protected]>
* Specify Android architecture in gradle filesAndreas Buhr2021-09-301-1/+7
| | | | | | | | | | | | | | | | | | | When building for armeabi-v7a, building and APK using "ninja foo_make_apk" works. Building it by calling "gradlew assembleDebug" works. Opening the "android-build" folder in Android Studio and clicking the "Build" button works. But clicking the "Run" or "Debug" button in Android Studio does not work when the attached phone is arm64-v8a. Then Android Studio automatically selects the v8 architecture which does not find the Qt libraries. This patch adds explicit ABI selection to the gradle configuration files. With explicit ABI selection, Android Studio does not try to outsmart you. Pick-to: 6.2 Fixes: QTBUG-96701 Task-number: QTBUG-87022 Change-Id: I4ad6356c38b7eca004c0e0dbbb357cab7de84c0f Reviewed-by: Assam Boudjelthia <[email protected]>
* Rename variable to not reference Qt5Andreas Buhr2021-09-301-0/+4
| | | | | | | | | In the Android gradle files, the variable qt5AndroidDir refers to Qt5 and might confuse users. This patch renames to qtAndroidDir. Pick-to: 6.2 Change-Id: Ib18a3cd2c38646e4c6c0435dae9234f0f7887eb5 Reviewed-by: Assam Boudjelthia <[email protected]>
* Android: fix error when signing bundlesAssam Boudjelthia2021-09-241-1/+1
| | | | | | | | | | | | | | The jarsigner command that was being used was malformed before the file path leading to wrong signing command. A sample of the malformed command part "-storepass password⍣/path/to/package", note the char after 'password'. So having auto produces a QStringBuilder that's returning the malformed char. Fixes: QTBUG-96838 Change-Id: I5477f6913a74d79ebaf029ef7f4e2745c9f7ced0 Reviewed-by: Ville Voutilainen <[email protected]> (cherry picked from commit f492790611fe15a4745c8ad0c97259f438c91b6b) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
* Support deploying of libraries from a build tree when building android apkAlexey Edelev2021-09-091-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | If the project consists of an executable and multiple libraries that are linked to the executable, currently you need to specify them manually using QT_ANDROID_EXTRA_LIBS target property. This automates deploying of the libraries that are a part of the project build tree. _qt_internal_collect_target_apk_dependencies collects all the known non-imported shared libraries from the project build tree. When running androiddeployqt we specify extra library directories that point to the collected library locations in build tree, to help androiddeployqt resolve shared libraries that are build as a part of the project. The described procedure is running automatically if CMake version is greater than or equal to 3.18 is. For the CMake versions less than 3.18 users need to call a new public qt_finalize_project function at the end of project's top-level CMakeLists.txt Task-number: QTBUG-94714 Change-Id: I400ca4e49e940cfc25ae90d65372e79825bee55a Reviewed-by: Assam Boudjelthia <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* androiddeployqt: Add support of multiple qml root pathsAlexey Edelev2021-09-081-20/+37
| | | | | | | | | | | | | | | | | If application uses qml files from multiple locations, e.g. subdirectories inside source directory it's important to provide this information to qmlimportscanner to produce consistent set of QML modules that need to be included into the end-point application apk. This makes possible to specify more than one QT_QML_ROOT_PATH per target and propagates these paths to the qmlimportscanner using androiddeployqt tool. Pick-to: 6.2 Task-number: QTBUG-93340 Change-Id: Ic31017b3f2671108adb6d6118ef1c75f1ccc3ec5 Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Assam Boudjelthia <[email protected]>
* Allow building android{deployqt, testrunner} under target host_toolsAssam Boudjelthia2021-09-071-4/+5
| | | | | | | | | | | When doing a cross build for Android we need only the host tools which are available under cmake's host_tools target, but androiddeployqt and androidtestrunner are not part of that. This fixes that. Pick-to: 6.2 Change-Id: Icdbc4a78ca050b66ec8df656d9ec766ef6c9f4b9 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]>
* Update Android default SDK from 29 to 30Juha Vuolle2021-08-271-1/+1
| | | | | | | | | | | By the time of Qt 6.2 release all new apps targeting Play store must target API level 30 (Android 11) or above (starting in 08/2021 for new apps and 11/2021 for existing apps' updates). Pick-to: 6.2 5.15 Task-number: QTBUG-94451 Change-Id: Id7fa2fd62899a7259e365c917292c6c3ac0d2b0d Reviewed-by: Assam Boudjelthia <[email protected]>
* Add the json option to disable the zstd based compressionAlexey Edelev2021-08-231-1/+13
| | | | | | | | | | | | | Need to disable zstd compression if its support is not built in Qt for Android. The flag is dected when configuring user's project and is a part of the deployment settings. This partially fixes loading of android_rcc_bundle.rcc. Pick-to: 6.2 Task-number: QTBUG-93340 Task-number: QTBUG-95969 Change-Id: I635afb3f9e182a559d53e9344e07f62788f9837d Reviewed-by: Alexandru Croitor <[email protected]>
* QDirIterator: add nextFileInfo()Marc Mutz2021-07-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | Before this change, next() was the only way to advance the iterator, whether the caller was ultimately interested in just the filePath() (good) or not (bad luck, had to call .fileInfo()). Add a new function, nextFileInfo(), with returns fileInfo() instead. Incidentally, the returned object has already been constructed as part of advance()ing the iterator, so the new function is faster than next() even if the result is ignored, because we're not calculating a QString result the caller may not be interested in. Use the new function around the code. Fix a couple of cases of next(); fileInfo().filePath() (just use next()'s return value) as a drive-by. [ChangeLog][QtCore][QDirIterator] Added nextFileInfo(), which is like next(), but returns fileInfo() instead of filePath(). Change-Id: I601220575961169b44139fc55b9eae6c3197afb4 Reviewed-by: Mårten Nordheim <[email protected]>
* Fix C++20 compilation of androiddeployqtMarc Mutz2021-07-091-3/+3
| | | | | | | | | | | | u8 literals changed type from const char[] to const char8_t[] in C++20 and Qt APIs that don't use QUtf8StringView aren't prepared for it. Use a classical char literal for the time being. Amends 857be50b2e193b92de37c3e2bb5124d24d21a253. Pick-to: 6.2 Change-Id: I7f194befc08ab50cdef321d8900ee3553599a19e Reviewed-by: Andreas Buhr <[email protected]>
* Let androiddeployqt write a dependency fileAndreas Buhr2021-07-081-0/+52
| | | | | | | | | Let androiddeployqt write a dependency file so that the build system knows when to re-run it. Fixes: QTBUG-94567 Change-Id: I5985d707f257b22789013a74f0a6f7c4de6e5e88 Reviewed-by: Joerg Bornemann <[email protected]>
* Android: Make the manifest less to scary to read and editAssam Boudjelthia2021-07-011-13/+10
| | | | | | | | | | | | | | | | | Remove unnecessary elements from the manifest file, making it easier to manage and read. Mostly, the removed elements are more internal data that is populated by the build system and the user shouldn't have to worry or confront that. Also, use the same formatting used by Android Studio. [ChangeLog][Android] Remove some elements from the manifest file that are internal, to make it easier to deal with the manifest. Pick-to: 6.2 Change-Id: I6a1f275b579370972c0bf022502a8fbfe7d0bfd1 Reviewed-by: BogDan Vatra <[email protected]>
* Remove ministro codeAssam Boudjelthia2021-07-011-16/+7
| | | | | | | | | | | | | | Since Ministro no longer work on recent Android versions (Android 8+), and it hasn't been maintained and the repos are not updated, the existing code is practically a dead code. [ChangeLog][Android] Remove ministro code since it's been unmaintained and not working with recent Android versions. Task-number: QTBUG-85201 Pick-to: 6.2 Change-Id: I18d7b1e209cba3cfd04674060e9bf39aa5a5510f Reviewed-by: BogDan Vatra <[email protected]>
* Android: don't call qmlimportscanner if no qml dir existAssam Boudjelthia2021-06-071-14/+38
| | | | | | | | | | | If only qtbase is installed, androiddeployqt might call qmlimportscanner which will fail to find a qml dir under the Qt install path. Thus, we check if the qml dir exists before calling qmlimportscanner otherwise throw a warning. Fixes: QTBUG-89588 Change-Id: I706eb2a233e9ab5b250652cd46aae75cab178648 Reviewed-by: Andy Shaw <[email protected]>
* Android: make the help print a bit easier to read and navigateAssam Boudjelthia2021-06-021-2/+21
| | | | | | | | Add new line between each argument type in the help print to make it easier to read and not a big wall of text. Change-Id: I7c7b2d2b59ef3a0889d1bb8c7af3d00b82bf820d Reviewed-by: Andy Shaw <[email protected]>
* androiddeployqt: Refactor apkSignerRunnerLars Schmertmann2021-05-211-15/+15
| | | | | | | | Avoid to publish all local variables in the lambda and only provide the necessary information as parameter. Change-Id: Iea68280f79f90ac3d5f7b9a0a92e073865a1d291 Reviewed-by: Assam Boudjelthia <[email protected]>
* Allow for arguments that have an equals as part of itAndy Shaw2021-05-141-3/+3
| | | | | | | | | | Since you can pass a define to org.gradle.jvmargs that can have the name=value approach, then we need to ensure that this is accounted for. Task-number: QTBUG-88989 Pick-to: 6.1 5.15 Change-Id: I2a795bff7ce683eca521b3a987293b3320accb6a Reviewed-by: Assam Boudjelthia <[email protected]>
* Android: check that app's lib_name value doesn't contain spacesAssam Boudjelthia2021-05-121-0/+9
| | | | | | | | | | android.app.lib_name is used for the app's lib that contains the main() function, *.so lib files usually have non-spaced names, thus to avoid wrong changes done to the manifest file, it's better to throw an error in this case. Change-Id: I4d4f0235612b308c78fd06a77690604c5c69f8ff Reviewed-by: Andy Shaw <[email protected]>
* androiddeployqt: Check if apk is already alignedMike Achtelik2021-05-121-18/+42
| | | | | | | | | | | | | Newer versions of the android gradle plugin already align the apk internally. Therefore it is not necessary to indiscriminately align every apk. So let's first check, if it is already aligned and only align it if necessary. This prevents possible alignment errors, which might occur when aligning it again. If it is already aligned, we can just copy and continue signing the apk. Fixes: QTBUG-88989 Change-Id: If29004e372e7927c88a900dc56f490bf9bce9ec7 Reviewed-by: Assam Boudjelthia <[email protected]>
* androiddeployqt: Fix the fallback location of rccJoerg Bornemann2021-04-071-1/+11
| | | | | | | | | | Now, that rcc lives in libexec, we need to assume the location of rcc to be "bin" on Windows and "libexec" elsewhere. Pick-to: 6.1 Fixes: QTBUG-92245 Change-Id: Idb81a5d02bae9ca3254e7590140a128500572b07 Reviewed-by: Alexandru Croitor <[email protected]>
* Remove redundant code in androiddeployqt/main.cppEdward Welbourne2021-02-181-11/+4
| | | | | | | | Prompted by a PVS-studio article. Pick-to: 6.1 6.0 Change-Id: I9699cc9baf9c90a6cf5b9564cd175205a9b2fa6b Reviewed-by: Assam Boudjelthia <[email protected]>
* Revert "Android: print tailored warning if qml dependency path is a dir"Assam Boudjelthia2020-12-091-8/+2
| | | | | | | | | | | | | | | This reverts commit c730a29260eda298683803bfd5306926696eedb0. Reason for revert: The original change was wrong and caused androiddeployqt to skip valid QML resource paths.  Additionally, change log output from "file" to "path" when skipping an import path. Pick-to: 6.0 5.15 Fixes: QTBUG-89281 Change-Id: Ic338d147a04a03bb1d7acbede11b647ff036922a Reviewed-by: Andy Shaw <[email protected]>
* Android: print tailored warning if qml dependency path is a dirAssam Boudjelthia2020-12-011-0/+6
| | | | | | | | | androiddeployqt might be misleading when the path is adir and the warning says that the file does not exist. Pick-to: 5.15 Change-Id: I1129f49af58a0637a240fcfd425a61b2ed15c840 Reviewed-by: Ville Voutilainen <[email protected]>
* Change android target SDK version to 29Fabio Falsini2020-11-261-1/+1
| | | | | | | | | Play Store now accept only app with target SDK version set to 29 or above Pick-to: 6.0 Change-Id: If38f20c88fd6b0e6f29939cdf3d2eb793c0e1489 Reviewed-by: Assam Boudjelthia <[email protected]>
* Android: use extraPrefixDirs with qmlimportscannerAssam Boudjelthia2020-11-191-2/+12
| | | | | | | | | This will ensure that qmlimportscanner can use the extraPrefixDirs, when an extra prefix is provided like the case with Conan builds. Task-number: QTBUG-88519 Change-Id: Idec3916b043822da094973a7e246a6ee4af14c83 Reviewed-by: Andy Shaw <[email protected]>
* QFileInfo: mark constructors as explicitGiuseppe D'Angelo2020-11-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | These look like leftovers (API flaws). Construction of QFileInfo from QString (or similar) should be not implicit, as QFileInfo construction is expensive (might hit the file system), and this may have users overlook APIs (for instance build a QFileInfo out of QDirIterator::next(), instead of using ::fileInfo(); using QDir::entryList instead of entryInfoList; etc.). Leave an opt-out mechanism to ease porting. Fix a handful of usages around qtbase, with at least a couple of them likely to be actual "sloppy" code. [ChangeLog][Potentially Source-Incompatible Changes][QFileInfo] Most QFileInfo constructors are now explicit. The QT_IMPLICIT_QFILEINFO_CONSTRUCTION macro is provided to keep old code working. Change-Id: Ic580e6316e67edbc840aa0c60d98c7aaabaf1af6 Reviewed-by: Volker Hilsheimer <[email protected]>
* Fix Clang compiler warnings (-Wrange-loop-analysis)David Skoland2020-10-171-1/+1
| | | | | | | | | | | | | | | In a macOS environment, Clang throws a number of compiler warnings about loop variables when building qtbase. See task for more info about the environment. This changes a handful of loop variables, like QJsonValue references into QJsonValueRefs. Task-number: QTBUG-87216 Pick-to: 5.15 Change-Id: I26006efd7c75c2d56ebc7f7efb4c9bdcabe92e8b Reviewed-by: Thiago Macieira <[email protected]>
* Android: fix path issue with backslashes on WindowsAssam Boudjelthia2020-10-151-2/+2
| | | | | | | | | | | | The androiddeployqt tool wasn't handling dependencies with backslashes properly, some dependencies like libplugins_platforms_qtforandroid was written into libs.xml as plugins\platforms\libplugins_platforms_qtforandroid_armeabi, the the app won't be looking for the correct path of the lib to load. Task-number: QTBUG-87574 Change-Id: Iad8c74d30d090adf69a17f2dafb455dff50b3d99 Reviewed-by: Andy Shaw <[email protected]>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-031-1/+1
| | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: Ibb68947289be1079911b34ea157bf089cc52c47f Reviewed-by: Alexandru Croitor <[email protected]>
* Android: Make checking a dependency path accept both separator stylesAlessandro Portale2020-10-021-2/+2
| | | | | | | | | | | The path of dependencies (.so, .jar, etc.) might use either native or non-native dir separators. Let's support both cases. Amends: 4e94465096bd03f649da8b9b2e287d13a1bc3bd5 Task-number: QTBUG-87066 Change-Id: I8ce3235db5bab8c4c139f841d3a2fe74d3c7c7f2 Reviewed-by: Assam Boudjelthia <[email protected]>
* Android: account for native separators when checking a dependency pathAssam Boudjelthia2020-10-011-2/+2
| | | | | | | | | The path of dependencies (.so, .jar, etc.) might use native dir separators, but if checks when not accounting for that. Task-number: QTBUG-87066 Change-Id: I0a09231f2a19f448f1ba520fd738d129d64ff5c7 Reviewed-by: Alessandro Portale <[email protected]>
* Android: Append .exe suffix to qmlImportScanner in androiddeployqtAlessandro Portale2020-09-301-4/+3
| | | | | Change-Id: I9d67d94eb9c19b36075311ddee20c972a645d28d Reviewed-by: Assam Boudjelthia <[email protected]>
* CMake: make QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with qmakeAssam Boudjelthia2020-09-281-1/+1
| | | | | | | | | Make name format of QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with qmake, that is android-${target}-deployment-settings.json. Task-number: QTCREATORBUG-24678 Change-Id: I2bdb056cf7a82fd83aaf658f3a405a0c9ef05756 Reviewed-by: Alexandru Croitor <[email protected]>
* Android: remove --no-daemon arg for GradleAssam Boudjelthia2020-09-171-1/+1
| | | | | | | | | | | | | | Allow Gradle builds to run using JVM daemon, this will improve the current build time noticeably for clean builds and hugely for incremental builds. This will bring the Gradle build to comparable speed with a normal Gradle build in Android Studio. Task-number: QTBUG-86674 Pick-to: 5.15 Change-Id: Icc4267223802e4c9350b48099236650c023f868d Reviewed-by: Andy Shaw <[email protected]>
* Android: enable androiddeployqt to get the host's rcc binary pathAssam Boudjelthia2020-08-281-1/+15
| | | | | | | | | | Since Qt 6 CMake installs the host and target into separate directories, androiddeployqt fails to get the correct path to rcc. This change includes the host's rcc binary path in deployment-settings.json. Task-number: QTBUG-85399 Change-Id: I610bb6fea1180a119e4c0ceb75bf78c175ae430e Reviewed-by: Joerg Bornemann <[email protected]>
* Android: add option to get app arguments with AndroidManifest.xmlAssam Boudjelthia2020-08-281-0/+10
| | | | | | | | | | | AndroidManifest.xml file and the Android plugin already has a way to provide commandline-arguments to app with the tag "android.app.arguments". This change allow to set it from qmake/cmake and allow Qt Creator to use that. Task-number: QTCREATORBUG-23712 Change-Id: I3e680f40fd36ba6aaac7f344fb9509d2c3360e74 Reviewed-by: Ville Voutilainen <[email protected]>
* Android: add the option to set package signing information from env varsAssam Boudjelthia2020-08-251-1/+30
| | | | | | | | | | | | | | | | | Use the following env vars to help conceal private signing information: - QT_ANDROID_KEYSTORE_PATH - QT_ANDROID_KEYSTORE_ALIAS - QT_ANDROID_KEYSTORE_STORE_PASS - QT_ANDROID_KEYSTORE_KEY_PASS [ChangeLog][Platform Specific Changes][Android] Added the option to conceal package signing information using environment variables. Task-number: QTBUG-84922 Change-Id: I1fac51ed9e88ef42c761bc916ba1c3bf439806e8 Reviewed-by: hjk <[email protected]> Reviewed-by: Ville Voutilainen <[email protected]>
* Android: Be more verbose about which binary is not foundAlexandru Croitor2020-08-151-2/+3
| | | | | | | | | It's unclear that the actual file searched for is different from the error output. Make it clearer. Task-number: QTBUG-85399 Change-Id: Ia5eb6d03c42b399604ce452b88408e0e5071d17c Reviewed-by: Assam Boudjelthia <[email protected]>
* Fix another printf format warning with qsizetypeVolker Hilsheimer2020-07-071-1/+1
| | | | | | | | | As done in 939f5112a1033299ec1a178fbd4232717a98e735 elsewhere, use %zd and cast explicitly to size_t. Change-Id: I2fc7607725829f80cc125568246503af341749f1 Reviewed-by: Andrei Golubev <[email protected]> Reviewed-by: Tor Arne Vestbø <[email protected]>
* androiddeployqt: Fix format specifier warningsTor Arne Vestbø2020-07-031-3/+3
| | | | | | | Fixes: QTBUG-85344 Change-Id: I298370ef04b9be502c54bfee729e97379ad81231 Reviewed-by: Volker Hilsheimer <[email protected]> Reviewed-by: Andrei Golubev <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 10:50:23 +0000