diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-03-23 10:58:26 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-05-22 14:10:19 +0200 |
commit | e6a7c6548f15cb158c1a5a2ac97fadaecb54f1ee (patch) | |
tree | 7d50d6df4904590e6fa2edafd78ffb8ac439d2e8 /src/core/web_engine_context.cpp | |
parent | 6d6037be24bcbff5efada34ed39331c7c8b28f3b (diff) |
Add windows to the cmake build
Fix cmake for windows builds and add QtWebEngineSandbox target.
Task-number: QTBUG-91760
Change-Id: If962a81ddfb509d104ad8ffbfbf34f1150ae82ce
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
-rw-r--r-- | src/core/web_engine_context.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index b3a44def6..ed2a240d6 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -287,18 +287,6 @@ static void logContext(const char *glType, base::CommandLine *cmd) } } -#if defined(Q_OS_WIN) -sandbox::SandboxInterfaceInfo *staticSandboxInterfaceInfo(sandbox::SandboxInterfaceInfo *info) -{ - static sandbox::SandboxInterfaceInfo *g_info = nullptr; - if (info) { - Q_ASSERT(g_info == nullptr); - g_info = info; - } - return g_info; -} -#endif - extern std::unique_ptr<base::MessagePump> messagePumpFactory(); static void setupProxyPac(base::CommandLine *commandLine) @@ -806,7 +794,7 @@ WebEngineContext::WebEngineContext() content::ContentMainParams contentMainParams(m_mainDelegate.get()); #if defined(OS_WIN) - contentMainParams.sandbox_info = staticSandboxInterfaceInfo(); + contentMainParams.sandbox_info = QtWebEngineSandbox::staticSandboxInterfaceInfo(); sandbox::SandboxInterfaceInfo sandbox_info = {0}; if (!contentMainParams.sandbox_info) { content::InitializeSandboxInfo(&sandbox_info); |