diff options
Diffstat (limited to 'src/android/templates')
| -rw-r--r-- | src/android/templates/build.gradle | 8 | ||||
| -rw-r--r-- | src/android/templates/doc/src/android-manifest-file-configuration.qdoc | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index f94ffbde54..4a93923277 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.4.0' } } @@ -14,11 +14,11 @@ repositories { mavenCentral() } -apply plugin: 'com.android.application' +apply plugin: qtGradlePluginType dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - implementation 'androidx.core:core:1.10.1' + implementation 'androidx.core:core:1.13.1' } android { @@ -29,12 +29,14 @@ android { * - qtAndroidDir - holds the path to qt android files * needed to build any Qt application * on Android. + * - qtGradlePluginType - whether to build an app or a library * * are defined in gradle.properties file. This file is * updated by QtCreator and androiddeployqt tools. * Changing them manually might break the compilation! *******************************************************/ + namespace androidPackageName compileSdkVersion androidCompileSdkVersion buildToolsVersion androidBuildToolsVersion ndkVersion androidNdkVersion diff --git a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc index db0d3c7277..d32d16aa47 100644 --- a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc +++ b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc @@ -50,8 +50,10 @@ Qt sets the following manifest configuration by default: \li {1, 5} \l {Android: App Manifest <manifest>}{<manifest>} \li package \li Sets the package name. The default value is \c {org.qtproject.example.app_name}. + \warning This field is deprecated and moved to \c build.gradle. It will be removed + in an upcoming release. \row - \li \c {android:installLocation} + \li android:installLocation \li Sets the app's installation location, whether internal or external storage. The default value is \c auto. \row @@ -63,7 +65,7 @@ Qt sets the following manifest configuration by default: \li Sets the public version name. Populated from \c ANDROID_VERSION_NAME (qmake) and \c QT_ANDROID_VERSION_NAME (CMake). The default value is \c {1.0}. \row - \li \c {<supports-screens>} + \li <supports-screens> \li Sets the screen sizes that the app supports, default values are \c anyDensity, \c largeScreens, \c normalScreens, and \c smallScreens. |