diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-25 21:30:22 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-10 17:53:31 +0200 |
| commit | 73e64a98c696f516aed204cf79bacce7d2179030 (patch) | |
| tree | 8ba4be1678716e86c7e762fc28cf8b384fad0204 /src/android/java | |
| parent | 4b063c8467071e1c2d40f5fc493b7e3ec5a08520 (diff) | |
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>
Diffstat (limited to 'src/android/java')
| -rw-r--r-- | src/android/java/java.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/android/java/java.pro b/src/android/java/java.pro index 7f0dfa8a1b..e8967a82db 100644 --- a/src/android/java/java.pro +++ b/src/android/java/java.pro @@ -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) |