summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.cpp
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-04 13:53:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-04 20:47:57 +0100
commit355ef66c35350c04147a0b05f3116dca7477aa2c (patch)
tree3c87489e9decf4fd5ff7f4870ca273ad56d70491 /src/core/web_engine_context.cpp
parent5d66b66df1bc205a9ce3d25cfaaa84c961fa7a29 (diff)
Add Android specific build settings and command line switches
Although this is an unsupported platfrom for QtWebEngine it is needed for Boot2Qt-Android and can live upstream. Change-Id: I21fea1fd00c1206e3b56373349b30df5ee121fda Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/web_engine_context.cpp')
-rw-r--r--src/core/web_engine_context.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index dbaa948bf..03da61643 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -122,6 +122,13 @@ WebEngineContext::WebEngineContext(WebContentsAdapterClient::RenderingMode rende
parsedCommandLine->AppendSwitch(switches::kInProcessGPU);
}
+#if defined(OS_ANDROID)
+ // Force single-process mode for now.
+ parsedCommandLine->AppendSwitch(switches::kSingleProcess);
+ // This is needed so that we do not assert in single process mode.
+ parsedCommandLine->AppendSwitch(switches::kEnableThreadedCompositing);
+#endif
+
// Tell Chromium to use EGL instead of GLX if the Qt xcb plugin also does.
if (qApp->platformName() == QStringLiteral("xcb") && qApp->platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("egldisplay"), 0))
parsedCommandLine->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationEGLName);