diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:08 +0100 |
| commit | 9bb9de461f98ca3bcf6d19a38b1e813435ab0619 (patch) | |
| tree | b88ffc95d4c1303bf64e77cce2ca46cbcba7c501 /src/network/configure.json | |
| parent | 5e66ea373a581d7e62b829d0ffa7f84d754c7f8f (diff) | |
| parent | f2a61f2ce2fa81acb526965d55e5f22d47673b2a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9b4816b4aa6f0c51a446742db58b9d0dcf69aa09
Diffstat (limited to 'src/network/configure.json')
| -rw-r--r-- | src/network/configure.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 6bc71469dc..496401749f 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -94,6 +94,10 @@ "condition": "config.msvc" }, { + "libs": "-lssl_arm64-v8a -lcrypto_arm64-v8a", + "condition": "config.android" + }, + { "libs": "-lssl -lcrypto", "condition": "!config.msvc" } @@ -432,7 +436,7 @@ "report": [ { "type": "note", - "condition": "features.openssl-linked && libs.openssl.source != 0 + "condition": "!config.android && features.openssl-linked && libs.openssl.source != 0 && input.openssl.prefix == '' && input.openssl.libs == '' && input.openssl.libs.debug == ''", "message": "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. |