summaryrefslogtreecommitdiffstats
path: root/src/android/templates
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Bump androix dependency to 1.12.0"Assam Boudjelthia2024-01-081-1/+1
| | | | | | | | | | | | | | This reverts commit 3bae65e7d61f85d2942c89e46e913c1056ba2daa. Reason for revert: This version requires API >= 34 but we have AGP 7.4.1 which was tested against API 33 max, and updating it to version 8.x is blocked by QTBUG-106907. So, this will be re-stated AGP update is done. Task-number: QTBUG-106907 Pick-to: 6.7 Change-Id: I1551ace76392a0532e1ecf431d03afbbd9d4a300 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Android: set default style extraction to minimalAssam Boudjelthia2023-12-221-4/+0
| | | | | | | | | | | | | | The default value in the default manifest has been for few releases, set as minimal, and since Widgets Android style is not fully supported anymore, we can set this to default to minimal under the hood as well to avoid needing to always explicitly needing to set it to minimal. Pick-to: 6.7 Change-Id: Id0b2134c572694be1e190347ff75f51ade65f0c4 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: fix Android Manifest docs tableAssam Boudjelthia2023-12-201-5/+2
| | | | | | | | | The table had the wrong row span making it malfomatted. Task-number: QTBUG-115020 Pick-to: 6.7 Change-Id: Icc35df3cd7dcdad2407d4c93d7a2a8d3d1701275 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Bump androix dependency to 1.12.0André Klitzing2023-11-131-1/+1
| | | | | | | | | This avoids linter warning like in 5dc9692e48ea15ab3da4283997547a2849f1944e: Obsolete Gradle Dependency Pick-to: 6.6 Change-Id: I5850af3206f3eaf80850918a13705c59ac3fb4ea Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: remove redundant manifest android:label tag for <activity>Assam Boudjelthia2023-11-091-1/+0
| | | | | | | This is also highlighted by Android Studio Manifest editor. Change-Id: If159405b0fceeb955e26f3916dd0e96b6ca76003 Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
* Android: remove unneeded allowNativeHeapPointerTagging manifest flagAssam Boudjelthia2023-10-202-8/+0
| | | | | | | | | Amends b0907db9eae4b85fcab4fa997428c438d9443ee0. Pick-to: 6.5 6.6 Task-number: QTBUG-91150 Change-Id: Ic7886a9fc69781e4f21417075516106ccb6c7bf5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Bump androidx dependency to 1.10.1André Klitzing2023-08-301-1/+1
| | | | | | | | | This avoids linter warning: Obsolete Gradle Dependency Pick-to: 6.6 6.5 Change-Id: I9d2e3f7a4d082c7b90e5e533b9fe3d5046b79a48 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Doc: Move \target command to inside table cellPaul Wicking2023-08-031-8/+4
| | | | | | | | | | | `\target`s generate a span where they occur. If they occur outside a table cell, QDoc generates illformed html. Fix such instances by moving the offending line into the table cell they target. Task-number: QTBUG-115247 Pick-to: 6.6 6.5 Change-Id: I677e909ec73a6d0af8195d88d23581d8dd97c6e5 Reviewed-by: Luca Di Sera <luca.disera@qt.io>
* Android: allow using string based versions in compileSdkVersionAssam Boudjelthia2023-04-051-1/+1
| | | | | | | | | | | | | | | | Some platform sdk packages have names that contains non-integer characters such as android-33-ext5 or android-UpsideDownCake which fail building with androiddeployqt because build.gradle expects an integer only. This allows using string based versions and also fallbacks to setting an integer only value if it finds that the build.gradle of the project is still explicitly converting to integer (this to avoid breaking existing projects). Fixes: QTBUG-112465 Pick-to: 6.5 6.2 5.15 Change-Id: If8cfc0fb84f0880a43644dc0a4188671736d3e21 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Document tracing location android meta-dataAntti Määttä2023-03-011-0/+7
| | | | | | Pick-to: 6.5 Change-Id: I13467f022f1a3646315f2c0319e54db82d41e2c7 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: use FileProvider with QDesktopServices::openUrl()Assam Boudjelthia2023-02-244-0/+16
| | | | | | | | | | | | | | | | | Allow openUrl() to use FileProvider for opening files that are located under app scoped paths and that use a file scheme for Android sdk 24 or above. [ChangeLog][Core][Android] Add FileProvider support for QDesktopServices::openUrl(). [ChangeLog][Core][Android] Add AndroidX dependency to Gradle builds by default since it's required by FileProvider. Fixes: QTBUG-85238 Change-Id: Ia7403f74f2a8fd4886f74dba72e42b318ef5d079 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Do not add trace_location meta-data by defaultAntti Määttä2023-02-241-3/+0
| | | | | | | | | Instead document the meta-data and let the user set it. Pick-to: 6.5 Change-Id: I13c9cd0129ffeef7b72635f46f53cf3dbfcf6684 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update Gradle to 8.0 and Android Gradle Plug-in (AGP) to 7.4.1Rami Potinkara2023-02-151-1/+1
| | | | | | | | | | | Gradle 8.0 and AGP 7.4.1 are the latest versions at Feb 2023. Fixes: QTBUG-110875 Pick-to: 6.5 Change-Id: Ia13b9e7859a873d2aade8782c279266d0982da21 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* src: Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-101-4/+0
| | | | | | Pick-to: 6.5 Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add Q_TRACE_LOCATION to android supportAntti Määttä2023-02-091-0/+3
| | | | | | | | | | This is needed for tracing android devices. Pick-to: 6.5 Change-Id: Ic04e15b43b426bdb1232e671acb4163165eab666 Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Revert "Revert "Add support for MultiABI with custom install dir of the ↵Alexey Edelev2023-02-021-1/+1
| | | | | | | | | | | | android-build"" This reverts commit d7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1. Reason for revert: Found a working solution for the issue. Change-Id: Ia720cc63ece9dfb1a24067cdd9c3d79d4edbe3be Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Revert "Add support for MultiABI with custom install dir of the android-build"Alexandru Croitor2023-02-011-1/+1
| | | | | | | | | | This reverts commit 979a21dc4ee0c6f483c6b55e9242a153d659ab6f. Reason for revert: Caused QTBUG-110836 Task-number: QTBUG-110836 Change-Id: I4f31018954e6bb0f4e7b6db0df76d04c0a56d9b1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support for MultiABI with custom install dir of the android-buildFab Stz2023-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, "multi abi builds" of android projects works only if the android-build installation doesn't use custom install dirs (INSTALL_PREFIX, INSTALL_BINDIR...) At the same time, it fixes QTBUG-106533. The patches are the same as the ones in that bugreport. Add new items to android-*-deployment-settings.json: qtDataDirectory qtLibsDirectory qtLibExecsDirectory qtPluginsDirectory qtQmlDirectory Update androiddeployqt to be able to get files from their install location BTW (fixes QTBUG-106533): Install src/android/templates into INSTALL_DATADIR Install src/3rdparty/gradle into INSTALL_DATADIR Install src/android/java files into INSTALL_DATADIR Install all jars into INSTALL_DATADIR Add missing path to target_qt.conf Update target_qt.conf to have all path. Otherwise qmake wouldn't have the path when installing the android-build with custom install dirs like INSTALL_LIBDIR & friends Add support for a new cmake variable that can be set at build time of the android projects: QT_ANDROID_PATH_CMAKE_DIR_${abi} (Name chosen as brother of QT_HOST_PATH_CMAKE_DIR) Pick-to: 6.5 Fixes: QTBUG-106533 Fixes: QTBUG-107207 Change-Id: Ia3751362ab1b5f877ecafbe02f263feac167119c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: add build dirs/files of Android templates to .gitignoreAssam Boudjelthia2023-01-241-0/+4
| | | | | | | | | Those files/dirs are only build time generated by IDEs like Android Studio or gradle builds, so ignore them. Pick-to: 6.5 6.4 6.2 Change-Id: Ib4785f9cc75412825d5be4cb5fe206587f37d193 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake:Android: copy templates, bindings and gradle files pre_buildAssam Boudjelthia2022-12-091-0/+9
| | | | | | | | | | | | | | | | At the moment when doing a non-prefix build and changing some of those files, CMake will not update the changes to the build folder unless done manually or a re-configure is done manually. qt_copy_or_install() only does copy those files at configure time once, and using CMAKE_CONFIGURE_DEPENDS would be an overkill here and even a bit of an extra annoyance, so in this case having a custom command seem to be suitable. Done-with: Alexey Edelev <alexey.edelev@qt.io> Change-Id: I55aa9e9d3eea32a4bb54c64abd4cbdcb891c44b6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake:Android: add Android templates, bindings and gradle files to treeAssam Boudjelthia2022-12-021-3/+10
| | | | | | | | | | Add Android templates, bindings and gradle wrapper files to custom targets so they can be easily tracked by the project tree when using Qt Creator for example. Change-Id: I4144b9ee461139a9f768c57b14139e0fc21d4c28 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update Gradle to 7.5.1 and Android Gradle Plug-in (AGP) to 7.3.1Rami Potinkara2022-11-251-1/+1
| | | | | | | | | Gradle 7.5.1 and AGP 7.3.1 versions are the latest at the moment. Fixes: QTBUG-105510 Change-Id: Ie2229e8929a82d60836a5fe7b3a879459995f63e Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fix a typo in Android docsThibaut Cuvelier2022-10-051-1/+1
| | | | | | | | One cell spans 7 rows, while it indicated 8 rows. This typo implied that one row had four columns, unlike all the others. Change-Id: I6ae6f5b08fa5183228d1fb878d821a22bc2a1d39 Reviewed-by: Luca Di Sera <luca.disera@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-231-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: I5d3ef70a31235868b9be6cb479b7621bf2a8ba39 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-08-031-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I3b98cdc55ead806ec81ce09af9271f9b95af97fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update Gradle to 7.4.2 and Android Gradle Plug-in (AGP) to 7.2.1Rami Potinkara2022-07-061-1/+1
| | | | | | | | | Gradle 7.4.2 and AGP 7.2.1 versions are the latest at the moment. Fixes: QTBUG-103711 Pick-to: 6.4 Change-Id: I871d1331e0340e1cda7dbbc0799bb2c20aed6146 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add option to not include native libraries in APKTinja Paavoseppä2022-05-202-3/+15
| | | | | | | | | | | | | | | | | Sometimes it is not desirable to include the libraries in the APK, e.g. system and vendor apps could prefer having one set of libraries installed on the device. If unbundled deployment is specified, native libraries will not be included in the APK. With unbundled deployment, optional arguments can be passed to set the path to load the libraries on the device. [ChangeLog][Android][Deployment Changes] Adds option for Unbundled deployment, where native libraries are not packaged in the APK. Task-number: QAA-771 Change-Id: Ica51ef83a24dad58c7586bf610a58abe21fc1100 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-161-26/+2
| | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Id880c92784c40f3bbde861c0d93f58151c18b9f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Android: set useLegacyPackaging to true in build.gradleAssam Boudjelthia2022-04-263-4/+3
| | | | | | | | | | | | Since we set android:extractNativeLibs to "true" in AndroidManifest.xml, a warning is thrown by the gradle build, which needs the property packagingOptions.jniLibs.useLegacyPackaging to be set to true. Pick-to: 6.2 6.3 5.15 Change-Id: I725d2663d68ab88abfda630f8a61666510043967 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ramon Sadornil <ramon.sadornil@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Android: add missing properties in AndroidManifest.xmlAssam Boudjelthia2022-04-262-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | Some missing values has to be defined in AndroidManifest.xml, otherwise, warnings might be thrown. * android:exported="true": because the manifest sets an intent-filter, and it then has to explicitly to avoid the warning [1]. * android:allowBackup="true": this has to be explicitly set, we set it to the default value here [2]. * android:fullBackupOnly="false": SDK 23+ use this to deteremine to user auto backup or not, we set it to the default value here [3]. [1] https://developer.android.com/guide/topics/manifest/activity- element#exported [2] https://developer.android.com/guide/topics/manifest/application- element#allowbackup [3] https://developer.android.com/guide/topics/manifest/application- element#fullBackupOnly Pick-to: 6.2 6.3 5.15 Fixes: QTBUG-101320 Change-Id: I0872dc00e48a867154ec9ded26620383fb747918 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Android: rephrase default value statement use in manifest doc pageAssam Boudjelthia2022-03-111-23/+23
| | | | | | | | Use "The default value is \c xxx" instead of "Default \c xxx". Pick-to: 6.2 6.3 Change-Id: Id75b45499c7fc0e9d42e66fa2b8b3515c863c61c Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Document use of android:allowNativeHeapPointerTagging in the manifestAssam Boudjelthia2022-03-051-0/+7
| | | | | | | | | | | Document the tag for more clarity on why it's needed, and for what platforms. Pick-to: 6.2 6.3 Task-number: QTBUG-97009 Task-number: QTBUG-91150 Change-Id: Ie4522fb582583be07270d3cdbf83992897b51669 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Docs: Move manifest and androiddeployqt docs to where code livesNicholas Bennett2021-11-191-0/+290
| | | | | | | | | | | Removed content describing androiddeployqt from deployment-android.html to androiddeployqt.html,the qdoc source now living in qtbase. Docs src locations added to the qtcore.qdocconf. Task-number: QTBUG-97842 Pick-to: 6.2 Change-Id: I94783520280098ce1ab35f335a644bea70b8131a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update Gradle to 7.2.0 and Android Gradle Plugin to 7.0.2Mårten Nordheim2021-10-221-1/+1
| | | | | | | | | | | | | | The latest build-tools 31.0.0 requires AGP version 7.0+, and that requires Gradle version 7.0+, so use the latest stable release for both. [1] https://developer.android.com/studio/releases/gradle-plugin? buildsystem=ndk-build#updating-gradle Fixes: QTBUG-97002 Pick-to: 6.2 Change-Id: I8ff26819bdf1a00f484ecc194c4d4e7bca2b598a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Android: set allowNativeHeapPointerTagging to false in the manifestAssam Boudjelthia2021-10-211-1/+2
| | | | | | | | | | | | | | | | Android 11 enables pointer tagging by default on arm64 systems [1], which can cause QML to get invalid data, which caused the color issue (and most likely other issues). [1] https://source.android.com/devices/tech/debug/tagged-pointers Fixes: QTBUG-97009 Task-number: QTBUG-91150 Change-Id: Ic4f145bba3345b3bee5445685f03269e3785f514 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 9fa805f7f8dfe96d561e9ed3170770ad768baf93) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: replace ndk.dir with android.ndkVersion in build.gradleAssam Boudjelthia2021-10-131-1/+1
| | | | | | | | | | | | 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 <bogdan@kdab.com> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
* Android: use gradle repo mavenCentral() instead of jcenter()Assam Boudjelthia2021-10-061-2/+2
| | | | | | | | | | | jcenter() is deprecated and will be shutdown by next year [1], thus the replacement mavenCentral() could be used instead. [1] https://blog.gradle.org/jcenter-shutdown Pick-to: 6.2 Change-Id: Ic9d1c15d657f23712ee4c866d5c1a45706353429 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Android: remove comments from the manifest fileAssam Boudjelthia2021-10-021-44/+6
| | | | | | | | | | | The comments are not needed, since we're adding a docs page for the manifest, which include the information from these comments and more. Keep the manifest clean. Pick-to: 6.2 Task-number: QTBUG-95285 Change-Id: I1fd8bc695f5aab1bcc69f549cb3ddeeaac168b98 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Specify Android architecture in gradle filesAndreas Buhr2021-09-301-0/+1
| | | | | | | | | | | | | | | | | | | 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 <assam.boudjelthia@qt.io>
* Rename variable to not reference Qt5Andreas Buhr2021-09-301-4/+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 <assam.boudjelthia@qt.io>
* Fix hidden API access for Android styleAssam Boudjelthia2021-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | Use public API and attributes to retrieve part of the Android style values instead of using reflection to access hidden or private fields. This latter method, was throwing lots of warnings or exceptions at the start of apps making it big annoyance to deal with. This patch doesn't handle drawables though, so the "full" and "default" Android style will be somehow broken still for now. For that reason, the default style extraction method is set to minimal to avoid getting warnings about it, and Fusion style could be used for Widgets apps, and for QML apps, it's recommended to use the Material style from Quick Controls 2. Pick-to: 6.2 5.15 6.1 Task-number: QTBUG-71590 Change-Id: If87895dc66751e23c9f4ea840e9f3e611aaa8833 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Android: Make the manifest less to scary to read and editAssam Boudjelthia2021-07-012-49/+58
| | | | | | | | | | | | | | | | | 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 <bogdan@kdab.com>
* Remove ministro codeAssam Boudjelthia2021-07-012-9/+0
| | | | | | | | | | | | | | 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 <bogdan@kdab.com>
* Remove unnecessary = signs from build.gradleAssam Boudjelthia2021-06-021-2/+2
| | | | | Change-Id: Ic7090ec2003b20a809f8920bae28bc9b88733cb8 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: Bump gradle (plugin) versionsMike Achtelik2021-04-101-2/+2
| | | | | | | | | | | | | | | | | | | Android Gradle plugin 4.1.3 is compatible with the new <queries> declaration for package visibility on Android 11. If someone adds the <queries> element or starts relying on a library or SDK that supports targeting Android 11, they might encounter manifest merging errors when building the app. This is important since starting August 2021 the PlayStore requires new apps from targeting Android 11. So lets update to the newest Android Gradle plugin version. This also reverts 1e4dec12d5c0152d5c3eee3b612a0af4bf389a37 as AGP 4.1 requires at least buildToolsVersion 29.0.2. Change-Id: Id8ce5dadeb8a325dc9f901503946f325f3fd18a0 Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Add legacy external storage access flagFabio Falsini2021-04-071-1/+1
| | | | | | | | | | | | | | | Since latest version of Qt need Android target sdk 29 the qt direct storage access doesn't work because a new scoped storage access way has been introduced. This flag allow to have current storage access way to work again (but is limited to target sdk 29 only) Pick-to: 5.15 6.1 Fixes: QTBUG-92239 Change-Id: If0d0af7c171de4b3e8bb8dd9a88fd61b65d1c839 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Remove the qmake project filesJoerg Bornemann2021-01-071-31/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Android: fix android java and templates targets with -developer-buildAssam Boudjelthia2020-11-101-4/+10
| | | | | | | | | | | | | | On Windows with -developer-build java and templates files are not copied properly, this makes sure to copy the files and dir for both targets. Also, avoid creating a a deployment-settings.json file by adding "TEMPLATE = aux". Fixes: QTBUG-87627 Pick-to: 5.15 Change-Id: Iae269c3180a7b6d904fdba2e69fb3f815bbb1211 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-031-2/+2
| | | | | | | | | | 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 <alexandru.croitor@qt.io>
* Android: allow Android app building to use java 8 featuresAssam Boudjelthia2020-09-261-0/+5
| | | | | | | | | | Enable Gradle builds to use Java 8 features like lambda expression by default. Task-number: QTBUG-86282 Pick-to: 5.15 Change-Id: Ib497b8a789690fcca6e13ea4995e5966331c6c0d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 22:50:20 +0000