diff options
author | Andy Shaw <andy.shaw@qt.io> | 2019-12-11 08:13:32 +0100 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2020-01-02 14:27:05 +0000 |
commit | ef4448f1294f0e8ff2e398f1b8917917c3ac0d0b (patch) | |
tree | 09a45a895119b968b66c9f5a834529be3e9ad006 | |
parent | ee1b77e13240ae9e68af62ed9cfadabe3f8c936e (diff) |
Always add the extra Android apk and aab targets
The extra targets should be added to the project regardless so that
qmake can handle it appropriately. This enables make apk to work
correctly then from a SUBDIRS project.
Fixes: QTBUG-80351
Change-Id: If5903e0d2f543babfdb4ebbb13502e32ab97c6fc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | mkspecs/features/android/android.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 26374cabca..af004bbb25 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -41,10 +41,9 @@ build_pass { INSTALLS *= target } } else { - QMAKE_EXTRA_TARGETS *= aab apk apk_install_target - android-build-distclean.commands = \ $$QMAKE_DEL_TREE $$shell_quote($$shell_path($$OUT_PWD/android-build)) QMAKE_EXTRA_TARGETS *= android-build-distclean CLEAN_DEPS += android-build-distclean } +QMAKE_EXTRA_TARGETS *= aab apk apk_install_target |