diff options
| author | axis <qt-info@nokia.com> | 2009-07-07 08:50:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-07-07 08:50:33 (GMT) |
| commit | 1e192edd72789241e7397dcbc5ee326b2aed5790 (patch) | |
| tree | 430961aed08cdfa25717bde84c3f74a2f75673fe /doc/src/platform-notes.qdoc | |
| parent | 2aac0c8b71fffd7c0335c1429bd1f2405adaa5e7 (diff) | |
| parent | 343e8b7e75c98a4fd1b692a230de8d1132988705 (diff) | |
| download | Qt-1e192edd72789241e7397dcbc5ee326b2aed5790.zip Qt-1e192edd72789241e7397dcbc5ee326b2aed5790.tar.gz Qt-1e192edd72789241e7397dcbc5ee326b2aed5790.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
src/network/access/qhttpnetworkconnection_p.h
tests/auto/qstyle/qstyle.pro
tests/auto/qstyle/tst_qstyle.cpp
tools/configure/configureapp.cpp
configure.exe will be recompiled in next commit. Took ours.
Diffstat (limited to 'doc/src/platform-notes.qdoc')
| -rw-r--r-- | doc/src/platform-notes.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc index db52aff..de1fb74 100644 --- a/doc/src/platform-notes.qdoc +++ b/doc/src/platform-notes.qdoc @@ -397,7 +397,7 @@ \row \o Apple Mac OS X (32-bit) \o gcc 4.0.1 \row \o Linux (32 and 64-bit) \o gcc 4.1, 4.2, 4.3 \row \o Microsoft Windows \o gcc 3.4.2 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit), 2008, - \l{Known Issues in %VERSION%}{Intel icc (see note)} + \l{Intel C++ Compiler}{Intel icc (see note)} \endtable Any platform-compiler combinations not listed here should be considered unsupported. @@ -609,8 +609,9 @@ \section1 Intel C++ Compiler - \warning Please see the \l{Known Issues in %VERSION%} page for information - about an issue with this compiler. + Qt supports the Intel C++ compiler on both Windows and Linux. + However, there are a few issues on Linux (see the following + section). \section2 Intel C++ Compiler for Linux |