diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-10-09 14:22:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-09 17:32:06 +0200 |
| commit | 265d7172700739c0b2b14e33eb10e12cc9e90326 (patch) | |
| tree | bf891784db2858b9325c3e5cb6bf0eeb6086ba2e | |
| parent | 85378c35d6b0a31737f58025945da6dc61bba405 (diff) | |
| download | qtwebkit-265d7172700739c0b2b14e33eb10e12cc9e90326.tar.gz | |
Revert "Fix debug builds for Windows32 x86 bots."
This reverts commit 7d9d4f0dfe7fe6cab21c4dd45d2e86e7c49ed20a.
While this fixes the issue of running out of memory for linking
32bit debug builds on windows, it seems to introduce various problems
due to mixing debug and non-debug flags within the same binary.
Change-Id: I8836ffe4b4be61b652aae1bc3ce87246aef6e581
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/production_build.prf | 2 |
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 f06e762fe..c980d09d0 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++*|win32-msvc*:!contains(QMAKE_HOST.arch, x86_64):if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib { +linux-*|win32-g++*: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 |