summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-11-14 12:18:07 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-14 12:20:40 (GMT)
commit26fcd5356a25e092758a75aa4a5e5ef33fb5d926 (patch)
treebe68c20aee1c255a38bce4815ff3e1f36bd53755 /tools
parent3275f61d157af5237795b8539ad3d0de4c67b0ec (diff)
downloadQt-26fcd5356a25e092758a75aa4a5e5ef33fb5d926.zip
Qt-26fcd5356a25e092758a75aa4a5e5ef33fb5d926.tar.gz
Qt-26fcd5356a25e092758a75aa4a5e5ef33fb5d926.tar.bz2
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
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/qdoc3.pro5
1 files changed, 5 insertions, 0 deletions
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 {