diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
| commit | 0fc1516692fb11f3489bce11a8f0cc15ad8f6b63 (patch) | |
| tree | d39aa29c33b87430598fe17751a7d65529792660 /src/core/web_engine_context.cpp | |
| parent | db2f69bb58ab369e44ea8bb30dcdbe90660578a2 (diff) | |
| parent | ae657b918ff22da2553dc577c877b03f49cc2bdf (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/3rdparty
Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -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 d48c23815..85c1136d9 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -250,6 +250,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); |