diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 02:25:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 02:25:58 (GMT) |
| commit | b2a0005b47703bb628fe47923502fb2901cf311b (patch) | |
| tree | 1f2b043936cbf6a9f2e831a685df13ec172050f1 /tools/qdoc3 | |
| parent | f118ef8c92953335960e37634a23a344750eff73 (diff) | |
| parent | f41964b2c24f4aa2c6659f2038b87e7c4b33d530 (diff) | |
| download | Qt-b2a0005b47703bb628fe47923502fb2901cf311b.zip Qt-b2a0005b47703bb628fe47923502fb2901cf311b.tar.gz Qt-b2a0005b47703bb628fe47923502fb2901cf311b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Update the supported platforms page.
Increase qdoc3 stack size when using MSVC to 4M.
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 5 |
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 { |