diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-02-11 18:37:38 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-02-20 12:57:24 +0000 |
| commit | d2b9c003f87e34ca599d3264a9af371e435ad0f8 (patch) | |
| tree | 2b9ced68cd24a2a06f8018152fa9f1de862e650e /src/core/web_engine_context.cpp | |
| parent | 552624b40f1af790bf747f52754895314d563f1d (diff) | |
Fix the build on eLinux
Update ozone layer to the new snapshot, update the
embedded_linux.pri configuration, fix the GLSurfaceQt
build on non-x11 linux and update embedded command line
switches for the 40.0.2214-based chromium snapshot.
This patch also updates the snapshot sha1 to include
required chromium changes.
Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index eb8f8b01d..2e6abd697 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -195,16 +195,13 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kInProcessGPU); #if defined(QTWEBENGINE_MOBILE_SWITCHES) - // Inspired from the Android port's default switches + // Inspired by the Android port's default switches parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbar); - parsedCommandLine->AppendSwitch(switches::kEnableGestureTapHighlight); parsedCommandLine->AppendSwitch(switches::kEnablePinch); parsedCommandLine->AppendSwitch(switches::kEnableViewport); parsedCommandLine->AppendSwitch(switches::kEnableViewportMeta); - parsedCommandLine->AppendSwitch(switches::kEnableSmoothScrolling); + parsedCommandLine->AppendSwitch(switches::kMainFrameResizesAreOrientationChanges); parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideoDecode); - parsedCommandLine->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); - parsedCommandLine->AppendSwitch(switches::kEnableCompositingForFixedPosition); parsedCommandLine->AppendSwitch(switches::kDisableGpuShaderDiskCache); parsedCommandLine->AppendSwitch(switches::kDisable2dCanvasAntialiasing); parsedCommandLine->AppendSwitch(switches::kEnableImplSidePainting); @@ -217,6 +214,7 @@ WebEngineContext::WebEngineContext() // On eAndroid we use this to get the native display // from Qt in GLSurfaceEGL::InitializeOneOff. m_surfaceFactory.reset(new SurfaceFactoryQt()); + parsedCommandLine->AppendSwitch(switches::kDisableOverscrollEdgeEffect); #endif GLContextHelper::initialize(); |