Commit ee7af79a authored by Michael Brüning's avatar Michael Brüning Committed by Michael Brüning
Browse files

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: default avatarSimon Hausmann <simon.hausmann@digia.com>
Showing with 2 additions and 1 deletion
Subproject commit be4ec3fa64a4c6c2b641830a9811ab7847c7dd39 Subproject commit e7cb37a52f362ea9fcc80ac4ba468fc9f8544fec
...@@ -196,6 +196,7 @@ WebEngineContext::WebEngineContext() ...@@ -196,6 +196,7 @@ WebEngineContext::WebEngineContext()
content::GpuProcessHost::RegisterGpuMainThreadFactory(content::CreateInProcessGpuThread); content::GpuProcessHost::RegisterGpuMainThreadFactory(content::CreateInProcessGpuThread);
content::ContentMainParams contentMainParams(m_mainDelegate.get()); content::ContentMainParams contentMainParams(m_mainDelegate.get());
contentMainParams.setup_signal_handlers = false;
#if defined(OS_WIN) #if defined(OS_WIN)
sandbox::SandboxInterfaceInfo sandbox_info = {0}; sandbox::SandboxInterfaceInfo sandbox_info = {0};
content::InitializeSandboxInfo(&sandbox_info); content::InitializeSandboxInfo(&sandbox_info);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment