From 26fcd5356a25e092758a75aa4a5e5ef33fb5d926 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 14 Nov 2011 13:18:07 +0100 Subject: Increase qdoc3 stack size when using MSVC to 4M. When running 'make docs' on Win7 with MSVC2010 64bit debug qdoc will crash from a stack overflow. The stack overflow occurs when sorting the list of nodes in the internal qdoc tree. This patch circumvents the stack overflow crash by increasing the stack size from the standard 1M to 4M. Reviewed-by: Friedemann Kleint --- tools/qdoc3/qdoc3.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index bb5ff83..254ba92 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -15,6 +15,11 @@ qdoc_bootstrapped { CONFIG -= debug_and_release_target } +# Increase the stack size on MSVC to 4M to avoid a stack overflow +win32-msvc*:{ +    QMAKE_LFLAGS += /STACK:\"4194304\" +} + !isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin #CONFIG += debug build_all:!build_pass { -- cgit v0.12 From f41964b2c24f4aa2c6659f2038b87e7c4b33d530 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 14 Nov 2011 15:00:55 +0100 Subject: Update the supported platforms page. Windows XP, Win7 32-bit and Mac 106 Cocoa were missing from the supported platforms table. --- doc/src/platforms/supported-platforms.qdoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index a3fc390..55ba94b 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -416,9 +416,11 @@ \o Compilers \row \o Ubuntu Linux 10.04 (32-bit) \o As provided by Ubuntu + \row \o Microsoft Windows XP SP3 (32-bit) + \o MSVC 2008 \row \o Microsoft Windows 7 (32-bit) \o MSVC 2008 - \row \o Microsoft Windows 7 (64-bit) + \row \o Microsoft Windows 7 (32-bit) \o MSVC 2010 SP1 \row \o Apple Mac OS X 10.6 "Snow Leopard" (64-bit) \o As provided by Apple @@ -440,6 +442,8 @@ \o As provided by Ubuntu \row \o Ubuntu Linux 10.04 (32-bit) \o Intel Compiler [version 12] + \row \o Apple Mac OS X 10.6 "Snow Leopard" Cocoa (32-bit) + \o As provided by Apple \endtable \section1 Tier 3 Platforms (Not Supported by Nokia) -- cgit v0.12