diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
| commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
| tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /src/core/config | |
| parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) | |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 8 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index ab2a60978..327144007 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -15,9 +15,11 @@ gn_args += \ enable_swiftshader=false \ use_custom_libcxx=false -!win32: gn_args += \ - use_jumbo_build=true \ - jumbo_file_merge_limit=50 +# Jumbo disabled for now due to OOM issues. +# !win32: gn_args += \ +# use_jumbo_build=true \ +# jumbo_file_merge_limit=20 \ +# jumbo_build_excluded="[\"browser\"]" qtConfig(webengine-printing-and-pdf) { gn_args += enable_basic_printing=true enable_print_preview=true diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index f4b6ff4e8..93ac471d4 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -4,11 +4,12 @@ QT_FOR_CONFIG += gui-private webengine-private gn_args += \ use_cups=false \ - use_gconf=false \ use_gio=false \ use_gnome_keyring=false \ use_kerberos=false \ - linux_use_bundled_binutils=false + linux_use_bundled_binutils=false \ + use_udev=true \ + use_bundled_fontconfig=false gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true @@ -127,7 +128,7 @@ host_build { qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true } qtConfig(webengine-system-png): gn_args += use_system_libpng=true - qtConfig(system-jpeg): gn_args += use_system_libjpeg=true + qtConfig(webengine-system-jpeg): gn_args += use_system_libjpeg=true qtConfig(system-freetype): gn_args += use_system_freetype=true qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true !qtConfig(webengine-system-glib): gn_args += use_glib=false |