diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-07 15:03:33 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-08 09:40:24 +0000 |
| commit | 512aae3abea65dcdc1e3d667eab73b8f41cf5601 (patch) | |
| tree | 4fa04cc8aba5ea30a439ebb6c6a1a989a2f24593 /src/gui | |
| parent | 6b193c88a7071b8ab9c81d2408b633a62226cf63 (diff) | |
Fix Android x86 builds
Replace condition x86 to i386 to match other platforms.
Regenerate src/gui/CMakeLists.txt
Disable SSE4 on android x86 to match qmake.
Change-Id: Ic0d330206f2d70a79d72553aa3ff0f91ff58119c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 3e0f11ccf5..1a21358fc7 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -478,7 +478,7 @@ extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 painting/qimagescale_neon.cpp ) -extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL x86 OR TEST_architecture_arch STREQUAL x86_64) +extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_sse2.cpp diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 9f0b07d929..6a62fa233c 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -560,7 +560,7 @@ extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 painting/qimagescale_neon.cpp ) -extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL x86 OR TEST_architecture_arch STREQUAL x86_64) +extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_sse2.cpp |