summaryrefslogtreecommitdiffstats
path: root/src/buildtools/config/windows.pri
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-10-31 11:28:09 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-12-19 14:05:40 +0100
commit79d4cf6e8eb569ec039c33e407fab787cc1a687f (patch)
treeb62d60ef2a8d1ed5662cdc38a68505ac018f1bf4 /src/buildtools/config/windows.pri
parent16651238b839b0e85c8a225657b6650c6005b176 (diff)
Enable Windows sandbox
Enable sandboxing on Windows. Enable heterogeneous sandbox symbol resolution and statically link the sandboxing code into the helper process. This means we have two copies of the sandboxing code, one statically linked in the executable and one in the shared library. Since they are not exported they don't conflict, but we need to take to initialize the right version in the helper process binary, and pass its sandbox interface to shared library using it. For sandbox debug output, we also need to initialize the second copy of the commandlineparser and logging system. Fixes: QTBUG-51170 Change-Id: I8f503c8d6b40674465f32772ef906817dad2b449 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/buildtools/config/windows.pri')
-rw-r--r--src/buildtools/config/windows.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buildtools/config/windows.pri b/src/buildtools/config/windows.pri
index b11396a0c..5d7b7e1f2 100644
--- a/src/buildtools/config/windows.pri
+++ b/src/buildtools/config/windows.pri
@@ -6,7 +6,8 @@ gn_args += \
ninja_use_custom_environment_files=false \
is_multi_dll_chrome=false \
win_linker_timing=true \
- com_init_check_hook_disabled=true
+ com_init_check_hook_disabled=true \
+ heterogeneous_executables=true
clang_cl {
clang_full_path = $$system_path($$which($${QMAKE_CXX}))