diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2015-01-07 17:04:05 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-01-08 10:53:32 +0100 |
| commit | ee7af79a213ea008e8e8bde4a993a92a66b01384 (patch) | |
| tree | 8c1c404952132380f50e9833d82de08f88d0de4b /src/core | |
| parent | 9beac6fdb35f0d0ab64c6d45b1802645b8ae6faf (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>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/web_engine_context.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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); |