From ee7af79a213ea008e8e8bde4a993a92a66b01384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Wed, 7 Jan 2015 17:04:05 +0100 Subject: 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 --- src/3rdparty | 2 +- src/core/web_engine_context.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index be4ec3fa6..e7cb37a52 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit be4ec3fa64a4c6c2b641830a9811ab7847c7dd39 +Subproject commit e7cb37a52f362ea9fcc80ac4ba468fc9f8544fec diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index db3956e5a..446f0e92c 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); -- cgit v1.2.3