diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-06 20:31:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-17 06:47:54 +0000 |
| commit | c0e94dd0933c549f35d05318cdcd97572c61fabf (patch) | |
| tree | d48fb9e579bcf3ffd8db6c28f42cb67d585d030e /mkspecs | |
| parent | ed07bdcb5f96d723f9c4c6b689ae95965c57c723 (diff) | |
don't overwrite pre-existing INSTALL for target
while it's mildly insane that we auto-generate install targets to start
with, we can at least refrain from doing so if there is one already.
as it happens, this removes the need for excluding the qt build
explicitly.
Task-number: QTBUG-38452
Change-Id: I74d5df447fba525fa79896c9be2c71d82bc2c6ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/android/android.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 7d77598e76..d2a3ee54c1 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -1,3 +1,6 @@ +android_install:contains(INSTALLS, target):!isEmpty(target.path): \ + CONFIG -= android_install + contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so @@ -8,7 +11,7 @@ contains(TEMPLATE, ".*app") { INSTALLS *= target } } -} else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install { +} else: contains(TEMPLATE, "lib"):android_install { target.path = /libs/$$ANDROID_TARGET_ARCH/ INSTALLS *= target } |