diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2021-09-28 09:58:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-30 13:06:31 +0000 |
| commit | 245a817941cf4733690ca618a8e806c106dd9c66 (patch) | |
| tree | 52db42279cb6ac0046e1d1aa447a2f1dd7af6097 /src/android | |
| parent | d296f173af34c8a32cf536a42c7f70f8798e06b6 (diff) | |
Rename variable to not reference Qt5
In the Android gradle files, the variable qt5AndroidDir refers to Qt5
and might confuse users. This patch renames to qtAndroidDir.
Change-Id: Ib18a3cd2c38646e4c6c0435dae9234f0f7887eb5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 95ef19371577e1646bd232763928e6ddf80d753f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/templates/build.gradle | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index 310b7106be..fd7ce34aa9 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -25,7 +25,7 @@ android { * The following variables: * - androidBuildToolsVersion, * - androidCompileSdkVersion - * - qt5AndroidDir - holds the path to qt android files + * - qtAndroidDir - holds the path to qt android files * needed to build any Qt application * on Android. * @@ -41,9 +41,9 @@ android { sourceSets { main { manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] - aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] - res.srcDirs = [qt5AndroidDir + '/res', 'res'] + java.srcDirs = [qtAndroidDir + '/src', 'src', 'java'] + aidl.srcDirs = [qtAndroidDir + '/src', 'src', 'aidl'] + res.srcDirs = [qtAndroidDir + '/res', 'res'] resources.srcDirs = ['resources'] renderscript.srcDirs = ['src'] assets.srcDirs = ['assets'] |