From e0668e653ae3931c5ff70731ac79a5ca9cb52de2 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 15 Nov 2018 11:42:09 +0100 Subject: Reinstate skipping content/browser for jumbo-builds We are hitting OOM crashes on the CIs again. Task-number: QTBUG-71870 Change-Id: Ief97b83b26091136acf4988e555b331191ce8271 Reviewed-by: Michal Klocek (cherry picked from commit 24d883d703d3599d6818b6b371ae06dd4ca6f734) Reviewed-by: Jani Heikkinen --- src/core/config/common.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 6b79a1f99..ddb4ca4bf 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -23,7 +23,8 @@ gn_args += \ !win32: gn_args += \ use_jumbo_build=true \ - jumbo_file_merge_limit=8 + jumbo_file_merge_limit=8 \ + jumbo_build_excluded="[\"browser\"]" qtConfig(webengine-printing-and-pdf) { gn_args += enable_basic_printing=true enable_print_preview=true -- cgit v1.2.1 From a64ac508573096297723d6f3bb95770a9504ca85 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 23 Nov 2018 13:12:58 +0100 Subject: Fix misleading information in changes Change-Id: I8b940140bbbb132e4b4524ac0b205551750a9585 Reviewed-by: Kai Koehne --- dist/changes-5.12.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 index 557bdf0a9..affb7567e 100644 --- a/dist/changes-5.12.0 +++ b/dist/changes-5.12.0 @@ -78,7 +78,7 @@ Qt WebEngine (QML) Chromium's behavior. - QWebEngineDownloadItem::page() accessor added to tell were the download was triggered. - [QTBUG-53745, QTBUG-69237] QWebEnginePage::printRequest added for window.print() support. -- [QTBUG-54877] Introduced support for client certificates on macOS and Windows. +- [QTBUG-54877] Introduced support for client certificates. - [QTBUG-64501] Fixed a way to trigger an infinite loop. - [QTBUG-69222] Fixed call order of print callback. -- cgit v1.2.1