diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-23 07:56:42 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-23 07:57:58 (GMT) |
| commit | 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113 (patch) | |
| tree | d5ff265350a3b48e124bff4a1d384c97e427fbd9 /doc | |
| parent | 6cef89c6442d06934c3545919e6b8283b3d8d1a4 (diff) | |
| download | Qt-4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.zip Qt-4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.tar.gz Qt-4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.tar.bz2 | |
Removed support for static linking of QtWebKit.
Static linking of WebKit is not going to be supported anymore in Qt 4.7,
so this commit makes sure it's mentioned in the documentation and that
configure disables WebKit if static linking of Qt is requested.
Reviewed-by: Andy Shaw <qt-info@nokia.com>
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 |