diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-27 17:56:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:36 +0000 |
| commit | 5d0fbf8a6890c395c0cdc0c60e775b70c95e15ed (patch) | |
| tree | c6354b09515a9110c121e3a3f3e97dd94b9b788a /src/core/config | |
| parent | 43b7af20c421e4ffb20cd4625f3b704e78e7325d (diff) | |
General adaptations for Chromium 69
Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 3 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 | ||||
| -rw-r--r-- | src/core/config/mac_osx.pri | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 48aafff1f..c41348f28 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -6,11 +6,14 @@ gn_args += \ use_qt=true \ is_component_build=false \ is_shared=true \ + enable_message_center=false \ + enable_mus=false \ enable_nacl=false \ enable_remoting=false \ enable_reporting=false \ enable_web_speech=false \ enable_widevine=true \ + has_native_accessibility=false \ use_allocator_shim=false \ use_allocator=\"none\" \ v8_use_external_startup_data=false \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index f0755f9cb..8ffc276de 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -14,7 +14,7 @@ gn_args += \ toolkit_views=false \ use_ozone=true \ ozone_auto_platforms=false \ - ozone_platform_headless=true \ + ozone_platform_headless=false \ ozone_platform_external=true \ ozone_platform=\"qt\" diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 2d820c889..e5e819e04 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -29,6 +29,7 @@ gn_args += \ clang_use_chrome_plugins=false \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \ + mac_views_browser=false \ toolkit_views=false \ use_external_popup_menu=false |