summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2015-01-07 17:04:05 +0100
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-01-08 10:53:32 +0100
commitee7af79a213ea008e8e8bde4a993a92a66b01384 (patch)
tree8c1c404952132380f50e9833d82de08f88d0de4b
parent9beac6fdb35f0d0ab64c6d45b1802645b8ae6faf (diff)
Tell the ContentMainRunner to not reset signal handlers in the browser process.
This prevents problems when QProcess::waitForFinished is used from the same application as QtWebEngine. Updates the src/3rdparty SHA1. Change-Id: I373456b1ef9f65e55b89acd877b15e7115516d6b Task-number: QTBUG-42747 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
m---------src/3rdparty0
-rw-r--r--src/core/web_engine_context.cpp1
2 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject be4ec3fa64a4c6c2b641830a9811ab7847c7dd3
+Subproject e7cb37a52f362ea9fcc80ac4ba468fc9f8544fe
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index db3956e5..446f0e92 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -196,6 +196,7 @@ WebEngineContext::WebEngineContext()
content::GpuProcessHost::RegisterGpuMainThreadFactory(content::CreateInProcessGpuThread);
content::ContentMainParams contentMainParams(m_mainDelegate.get());
+ contentMainParams.setup_signal_handlers = false;
#if defined(OS_WIN)
sandbox::SandboxInterfaceInfo sandbox_info = {0};
content::InitializeSandboxInfo(&sandbox_info);