summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-12-12 10:07:42 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-13 15:42:45 +0100
commit0dd71c40535335affe93bbde0543b81be796f03e (patch)
tree8cf4ef9638858dc8cf7e89ac66ef34529d6da828 /src
parent6aa4bb60d7d10e50cb562756ef8210f559b35d1e (diff)
Fix the utility process launching.
This would cause a crash of the render process while loading facebook.com since the utility process would try to use /proc/self/exe on linux. Bring back the kBrowserSubprocessPath switch to specify our subprocess executable. Change-Id: I4822d43f4a2b5ee86b941721da5ebb47d7a97c5d Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/web_engine_context.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 5dbb653cd..3f2bbc06d 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -59,6 +59,7 @@
#include "content_client_qt.h"
#include "content_main_delegate_qt.h"
#include "type_conversion.h"
+#include "web_engine_library_info.h"
#include <QGuiApplication>
#include <QStringList>
#include <QVector>
@@ -115,6 +116,7 @@ WebEngineContext::WebEngineContext(WebContentsAdapterClient::RenderingMode rende
CommandLine* parsedCommandLine = CommandLine::ForCurrentProcess();
parsedCommandLine->AppendSwitchASCII(switches::kUserAgent, webkit_glue::BuildUserAgentFromProduct("QtWebEngine/0.1"));
+ parsedCommandLine->AppendSwitchASCII(switches::kBrowserSubprocessPath, WebEngineLibraryInfo::subProcessPath().value().c_str());
parsedCommandLine->AppendSwitch(switches::kNoSandbox);
parsedCommandLine->AppendSwitch(switches::kDisablePlugins);