diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-06 11:08:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-11 22:26:29 +0000 |
| commit | c61fa3df0fc3373de79a633da8f9b42d41523b55 (patch) | |
| tree | eaa753eff25f8fc664597c93132dee6debdc35e2 /tools/qmake | |
| parent | cf55c06cf2a661be0e169a4406a9b79346d26ca5 (diff) | |
Fix cross-compile with NSS available
Chromium currently can't build configure with both NSS and embedded, so
we need to use OpenSSL in that configuration.
Change-Id: Ia680b2865d876d4dcd4df8624b8628ff579fc649
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index f117e214d..4be9fac20 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -52,9 +52,10 @@ defineTest(runConfigure) { config_snappy: WEBENGINE_CONFIG += use_system_snappy else: log("System snappy not found. Using Chromium's copy.$${EOL}") - # Optional dependencies - packagesExist(nss): WEBENGINE_CONFIG += use_nss - else: log("System NSS not found, BoringSSL will be used.$${EOL}") + !cross_compile { + packagesExist(nss): WEBENGINE_CONFIG += use_nss + else: log("System NSS not found, BoringSSL will be used.$${EOL}") + } } isEmpty(skipBuildReason): { |