diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-24 04:21:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-24 04:21:58 (GMT) |
| commit | 736067120b466248cbfc3180a533dc416953c5e0 (patch) | |
| tree | 8d169e62a1011bdb8fe3b05a6c3629b2a78e3048 /doc | |
| parent | 9d6ccfea89ae99b747f70ece71185868f189d0f9 (diff) | |
| parent | 5d64484bf0b37427133c163ad9b160e767dc1bcd (diff) | |
| download | Qt-736067120b466248cbfc3180a533dc416953c5e0.zip Qt-736067120b466248cbfc3180a533dc416953c5e0.tar.gz Qt-736067120b466248cbfc3180a533dc416953c5e0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/platforms/compiler-notes.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc index c365d88..7eb92e0 100644 --- a/doc/src/platforms/compiler-notes.qdoc +++ b/doc/src/platforms/compiler-notes.qdoc @@ -52,7 +52,7 @@ \table \header \o Compiler \o{5,1} Features - \header \o \o Concurrent \o XmlPatterns \o WebKit \o CLucene \o Phonon + \header \o \o Concurrent \o XmlPatterns \o WebKit(*) \o CLucene \o Phonon \row \o g++ 3.3 \o \o \bold{X} \o \o \bold{X} \o \bold{X} \row \o g++ 3.4 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \row @@ -67,6 +67,8 @@ \row \o MSVC 2005 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \endtable + * WebKit is only supported as a dynamically built library. Static linkage is not supported. + \target GCC \section1 GCC |