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) diff --git a/src/android/templates/templates.pro b/src/android/templates/templates.pro index 9a64251ee3..35a63498f8 100644 --- a/src/android/templates/templates.pro +++ b/src/android/templates/templates.pro @@ -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)