summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2013-09-27 14:19:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-04 12:12:47 +0200
commit7d9d4f0dfe7fe6cab21c4dd45d2e86e7c49ed20a (patch)
tree5d97527ddac45408e839ca33627d74322d168319
parent008aa4c4f36ff099c69b65f35262b851400102e4 (diff)
downloadqtwebkit-7d9d4f0dfe7fe6cab21c4dd45d2e86e7c49ed20a.tar.gz
Fix debug builds for Windows32 x86 bots.
Reviewed by Allan Sandfeld Jensen. There was an out of memory problem when linking the debug builds that had been solved on Linux and MinGW32 already by stripping debug info from production builds. This patch applies the same for MSVC builds on x86 hosts and enable the debug symbols again for builds running on x86_64 hosts. Change-Id: Id9ead480f243d8e48494f350a7a96b2bd2570c95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
-rw-r--r--Tools/qmake/mkspecs/features/production_build.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/production_build.prf b/Tools/qmake/mkspecs/features/production_build.prf
index c980d09d0..f06e762fe 100644
--- a/Tools/qmake/mkspecs/features/production_build.prf
+++ b/Tools/qmake/mkspecs/features/production_build.prf
@@ -7,7 +7,7 @@ CONFIG *= use_all_in_one_files
# resulting in the need of several gigabytes of memory at link-time. Reduce the pressure
# by compiling any static library like WTF or JSC with release flags instead and keep debug
# symbols for the static libraries that implement API.
-linux-*|win32-g++*:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib {
+linux-*|win32-g++*|win32-msvc*:!contains(QMAKE_HOST.arch, x86_64):if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib {
!equals(TARGET, WebKit2):!equals(TARGET, WebKitWidgets) {
CONFIG += no_debug_info
CONFIG -= separate_debug_info