diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-03 12:59:23 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-05 11:38:23 +0200 |
commit | 8f160af577e4d979954a63ab56f56e4d0c8ad0f8 (patch) | |
tree | 0c6cf366f3309c96e43e532527aff362320b7e94 /src/core/config | |
parent | 601003362c75283e9164e997e3835e7c36c6db00 (diff) | |
parent | fcdde728f0c4b4af5159b993e44eb6089d70aa90 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ida702fd5fa05a32d6cd7fc737aa061da74b675a0
Diffstat (limited to 'src/core/config')
-rw-r--r-- | src/core/config/linux.pri | 7 | ||||
-rw-r--r-- | src/core/config/windows.pri | 13 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 24951cd07..60cfa6857 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -98,17 +98,18 @@ contains(QT_ARCH, "mips"):!host_build { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" + GN_HOST_CPU = $$gnArch($$QT_ARCH) + gn_args += host_cpu=\"$$GN_HOST_CPU\" # Don't bother trying to use system libraries in this case gn_args += use_glib=false gn_args += use_system_libffi=false } else { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:target\" + gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" cross_compile { - gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" gn_args += v8_snapshot_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:v8_snapshot\" - GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) GN_TARGET_CPU = $$gnArch($$QT_ARCH) - gn_args += host_cpu=\"$$GN_HOST_CPU\" target_cpu=\"$$GN_TARGET_CPU\" + gn_args += target_cpu=\"$$GN_TARGET_CPU\" } !contains(QT_CONFIG, no-pkg-config) { # Strip '>2 /dev/null' from $$pkgConfigExecutable() diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 49c725475..f5dd4a9d3 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -36,10 +36,8 @@ defineTest(usingMSVC32BitCrossCompiler) { msvc:contains(QT_ARCH, "i386"):!usingMSVC32BitCrossCompiler() { # The 32 bit MSVC linker runs out of memory if we do not remove all debug information. - gn_args += symbol_level=0 -} else { - # Chromium builds with debug info in release by default but Qt doesn't - CONFIG(release, debug|release):!force_debug_info: gn_args += symbol_level=1 + force_debug_info: gn_args -= symbol_level=1 + gn_args *= symbol_level=0 } msvc { @@ -55,10 +53,11 @@ msvc { SDK_PATH = $$(WINDOWSSDKDIR) VS_PATH= $$(VSINSTALLDIR) - gn_args += visual_studio_path=$$shell_quote($$VS_PATH) - gn_args += windows_sdk_path=$$shell_quote($$SDK_PATH) + gn_args += visual_studio_path=\"$$clean_path($$VS_PATH)\" + gn_args += windows_sdk_path=\"$$clean_path($$SDK_PATH)\" - contains(QT_ARCH, "i386"): gn_args += target_cpu=\"x86\" + GN_TARGET_CPU = $$gnArch($$QT_ARCH) + gn_args += target_cpu=\"$$GN_TARGET_CPU\" } else { fatal("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler") |