diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:46:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:46:12 +0100 |
| commit | 56b0dabf8056c3af06d7e1e8e138742565904520 (patch) | |
| tree | 05954d1b5c81e611c82804fc600c692d45c44f3b /mkspecs/features/android | |
| parent | 072ca960f517f0cdfcb768dcbeebba2212a6c21e (diff) | |
| parent | 2a887a517eaaa2c5324aecf3b919899b7a86ff4a (diff) | |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I03927d2ef75514e4f2633839387806125d8954f1
Diffstat (limited to 'mkspecs/features/android')
| -rw-r--r-- | mkspecs/features/android/android.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index fc0ff553d0..26374cabca 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -36,6 +36,7 @@ build_pass { } } } else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install { + !contains(TARGET, "_$${QT_ARCH}"): TARGET = $${TARGET}_$${QT_ARCH} target.path = /libs/$$ANDROID_TARGET_ARCH/ INSTALLS *= target } |