diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-30 15:46:56 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-31 12:55:32 +0200 |
| commit | 704e215295954fc45b4f4c3fce4ba214cf3050cb (patch) | |
| tree | 2d06d65a4aed9c13244017f3c3bf9c89ee9110b9 /src/network | |
| parent | cb8072028753c32b11f6838cf8717f5414511975 (diff) | |
CMake: Regenerate projects
Change-Id: Iac12acd07513e790e531ae93366fdae70c1c61a5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index ecd3eebdc6..d47f4ff2e4 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -384,7 +384,7 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index b0d18fab0a..680b14c546 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -384,7 +384,7 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} |