diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-04 11:41:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-07 22:17:09 +0000 |
| commit | e16f177e093b40d5146047f3f27e8442ec20be10 (patch) | |
| tree | 61edd0173589c5eb1477c1d8d8020b4b30836b62 /src | |
| parent | 99c1e5934fef1dfda6ecd682e48b97abb6823887 (diff) | |
Do not enable debug symbols in windows release builds
Clean up the logic for cross-building to x86 on x86-64 windows, avoiding
enabling debug symbols when force_debug_info is set, remove them 32-bit
builds even it _is_ set, and use the standard logic for getting the GN
target arch.
Change-Id: Ia6a5a5e7429ffb1cf07629deaeebfb2466280a9b
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/config/windows.pri | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 8d5a65f6f..ba37e5d1a 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -40,10 +40,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 { @@ -62,7 +60,8 @@ msvc { gn_args += visual_studio_path=$$shell_quote($$VS_PATH) gn_args += windows_sdk_path=$$shell_quote($$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") |