diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 14:50:22 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 16:56:24 +0100 |
| commit | 7aa06a1614b7ca6508d96ee2e8ef0f4c49038a6f (patch) | |
| tree | 4331533a6c0fa7a843c831d66e62472a7f8a4d30 /src/core/web_engine_context.cpp | |
| parent | 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 (diff) | |
| parent | f17f815878d1d3f02f464347d2807555cab00a88 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.13
Conflicts:
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 90b1bffa5..63a1637fe 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -51,6 +51,7 @@ #include "cc/base/switches.h" #if QT_CONFIG(webengine_printing_and_pdf) #include "chrome/browser/printing/print_job_manager.h" +#include "components/printing/browser/features.h" #endif #include "components/viz/common/features.h" #include "components/web_cache/browser/web_cache_manager.h" @@ -457,6 +458,10 @@ WebEngineContext::WebEngineContext() appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, features::kBackgroundFetch.name); +#if QT_CONFIG(webengine_printing_and_pdf) + appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, printing::features::kUsePdfCompositorServiceForPrint.name); +#endif + if (useEmbeddedSwitches) { // embedded switches are based on the switches for Android, see content/browser/android/content_startup_flags.cc appendToFeatureSwitch(parsedCommandLine, switches::kEnableFeatures, features::kOverlayScrollbar.name); |