diff options
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 4 | ||||
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject cae02d31f1b15b139af822aa7559c5157780dbb +Subproject 2c3ccc7994980d954ec0188ea3fa3d27424ef32 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 88af144ba..dc6a5f612 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -29,6 +29,7 @@ GYP_CONFIG += \ p2p_apis=0 \ safe_browsing=0 \ toolkit_uses_gtk=0 \ + toolkit_views=1 \ use_ash=0 \ use_aura=1 \ use_cairo=0 \ @@ -43,8 +44,9 @@ GYP_CONFIG += \ use_ozone=1 \ use_pango=0 \ use_pulseaudio=0 \ + use_system_harfbuzz=0 \ use_system_icu=1 \ use_x11=0 \ v8_use_snapshot=false \ - want_separate_host_toolset=0 \ + want_separate_host_toolset=1 \ diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 916dd4195..f30c16401 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -50,6 +50,7 @@ ['exclude', 'gl_surface_glx\\.cc$'], ['exclude', 'gl_surface_x11\\.cc$'], ['exclude', 'gl_surface_win\\.cc$'], + ['exclude', 'gl_surface_ozone\\.cc$'], # Avoid the ATL dependency to allow building with VS Express ['exclude', 'browser/accessibility/accessibility_tree_formatter\\.(cc|h)$',], ['exclude', 'browser/accessibility/accessibility_tree_formatter_android\\.(cc|h)$',], @@ -78,6 +79,8 @@ # At runtime the env variable SSL_CERT_DIR can be used to override this 'OPENSSLDIR="/usr/lib/ssl"', 'OPENSSL_LOAD_CONF', + 'EGL_API_FB=1', + 'LINUX=1', ], 'defines!': [ 'OPENSSLDIR="/etc/ssl"', |