diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-03 11:18:52 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 11:56:26 +0200 |
| commit | d5e8a5d9cbcebec966833155728be3f2d293aafa (patch) | |
| tree | 45dc8cbe269150cdba0f4feff8c6755e70d39afa /cmake/QtFeature.cmake | |
| parent | db397d11130639abae1b1438b0685db2c75db330 (diff) | |
CMake: Fix missing qdevice.pri values and qt.conf info for Android
qdevice.pri should embed info about the Android SDK, NDK, host,
platform api level and ABI.
The machine tuple test should not be run for uikit and Android
platforms.
Sysroot should also not be prepended for uikit and Android
platforms, otherwise it breaks Qt module include paths.
Task-number: QTBUG-85399
Task-number: QTBUG-82581
Change-Id: Ic48c88f6ab15d75c2ebc323c8d7a3b7e5596f3c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtFeature.cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 870ae0d194..1ac23200c8 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -858,7 +858,7 @@ function(qt_config_compile_test_x86simd extension label) endfunction() function(qt_config_compile_test_machine_tuple label) - if(DEFINED TEST_MACHINE_TUPLE OR NOT (GCC OR CLANG)) + if(DEFINED TEST_MACHINE_TUPLE OR NOT LINUX OR ANDROID) return() endif() |