diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-14 15:18:50 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-14 13:49:40 +0000 |
| commit | 6694689a26c97d76f2fb7a518f0788b1e0eaf4e6 (patch) | |
| tree | a14d364a81b7ac44312692a3855f96eff49a6f6c /src/corelib/.prev_CMakeLists.txt | |
| parent | 665f75f1f112f948f8acfadc1d54b0df8c4211a4 (diff) | |
Fix Android build from multi-arch qmake changes
Add condition replacements for the android ABIs.
Add a replacement for QT_ARCH to ANDROID_ABI, since QT_ARCH is only used
with the android build for now.
Change-Id: I553d7910546de32236f723ec2e9a05a18da76130
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 74da7af125..0f9b17ff01 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -315,7 +315,7 @@ extend_target(Core CONDITION ANDROID kernel/qsharedmemory_android.cpp kernel/qsystemsemaphore_android.cpp DEFINES - LIBS_SUFFIX='\\"_.so\\"' + LIBS_SUFFIX='\\"_${ANDROID_ABI}.so\\"' ) extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") |