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 | |
| 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.
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 6 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 5 |
2 files changed, 10 insertions, 1 deletions
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) 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 { |