whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: fix android java and templates targets with -developer-build 

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>
bb10
Assam Boudjelthia 2020-10-25 21:30:22 +02:00
parent 4b063c8467
commit 73e64a98c6
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/java/java.pro
View File

@ -1,5 +1,7 @@
CONFIG += single_arch
TEMPLATE = aux
TARGET = dummy
CONFIG += single_arch
CONFIG -= qt android_install
javaresources.files = \
@ -11,6 +13,8 @@ javaresources.path = $$[QT_INSTALL_PREFIX]/src/android/java
INSTALLS += javaresources
!prefix_build:!equals(OUT_PWD, $$PWD) {
COPIES += javaresources
RETURN = $$escape_expand(\\n\\t)
equals(QMAKE_HOST.os, Windows) {
RETURN = $$escape_expand(\\r\\n\\t)

14
src/android/templates/templates.pro
View File

@ -1,17 +1,23 @@
CONFIG += single_arch
TEMPLATE = aux
TARGET = dummy
CONFIG += single_arch
CONFIG -= qt android_install
templates.files = \
$$PWD/AndroidManifest.xml \
$$PWD/build.gradle \
$$PWD/res
$$PWD/build.gradle
templates_dirs.files += $$PWD/res
templates.path = $$[QT_INSTALL_PREFIX]/src/android/templates
templates_dirs.path = $${templates.path}
INSTALLS += templates
INSTALLS += templates templates_dirs
!prefix_build:!equals(OUT_PWD, $$PWD) {
COPIES += templates templates_dirs
RETURN = $$escape_expand(\\n\\t)
equals(QMAKE_HOST.os, Windows) {
RETURN = $$escape_expand(\\r\\n\\t)