1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't overwrite pre-existing INSTALL for target

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2017-06-06 20:31:59 +02:00
parent ed07bdcb5f
commit c0e94dd093
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/android/android.prf
View File

@ -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
}