diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-19 12:37:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:06 +0000 |
| commit | f4a8ce98bd371acf1ca1eb2c58a8403e8795a670 (patch) | |
| tree | 1f2305261b605aae31e5f8737ffcb275986baf1e /src/core/config | |
| parent | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (diff) | |
Adaptations for Chromium 63
Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/linux.pri | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 6f7b27f10..cdb723b79 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -8,9 +8,7 @@ gn_args += \ use_gio=false \ use_gnome_keyring=false \ use_kerberos=false \ - linux_use_bundled_binutils=false \ - use_nss_certs=true \ - use_openssl_certs=false + linux_use_bundled_binutils=false gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true @@ -95,7 +93,6 @@ host_build { gn_args += host_cpu=\"$$GN_HOST_CPU\" # Don't bother trying to use system libraries in this case gn_args += use_glib=false - gn_args += use_system_libffi=false } else { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:target\" gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" @@ -136,8 +133,6 @@ host_build { } else { gn_args += use_alsa=false } - packagesExist(libffi): gn_args += use_system_libffi=true - else: gn_args += use_system_libffi=false !packagesExist(libpci): gn_args += use_libpci=false !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false |