diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2019-12-06 14:26:17 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2020-01-09 08:25:42 +0200 |
| commit | ce04fa345dbe52a022b592dde3ff49514c66b4c2 (patch) | |
| tree | f28350b7e0b47ece0e0b7c3df100adc0ac3a7e09 /mkspecs/features/android/android.prf | |
| parent | 1edf8bc46542ad302085b9e957c8c3c31c7db9da (diff) | |
Android: make sure we don't add _$${QT_ARCH} twice
Fixes: QTBUG-80582
Change-Id: I2b3790bb18754e146db611d61c48a3b7a532575c
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'mkspecs/features/android/android.prf')
| -rw-r--r-- | mkspecs/features/android/android.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index af004bbb25..8290286ec6 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -36,7 +36,8 @@ build_pass { } } } else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install { - !contains(TARGET, "_$${QT_ARCH}"): TARGET = $${TARGET}_$${QT_ARCH} + tmpvar = $$str_member(TARGET, -$$str_size(QT_ARCH), -1) + !equals(tmpvar, $${QT_ARCH}): TARGET = $${TARGET}_$${QT_ARCH} target.path = /libs/$$ANDROID_TARGET_ARCH/ INSTALLS *= target } |