diff options
authorLiang Qi <>2016-09-17 22:54:51 +0200
committerLiang Qi <>2016-09-17 22:54:51 +0200
commit11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e (patch)
parentca1370e27a4f86771809b4499da9dc61807ba03e (diff)
parentd7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
1 files changed, 7 insertions, 3 deletions
diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc
index 59980de..1656f60 100644
--- a/src/imageformats/doc/src/qtimageformats.qdoc
+++ b/src/imageformats/doc/src/qtimageformats.qdoc
@@ -51,17 +51,21 @@ libraries. If not found, it may fall back on using a bundled copy (in
\c src/3rdparty).
-\header \li Format \li Description \li Support \li 3rd party codec
+\header \li Format \li Description \li Support \li 3rd Party Codec
\row \li DDS \li Direct Draw Surface \li Read/write \li No
\row \li ICNS \li Apple Icon Image \li Read/write \li No
-\row \li JP2 \li Joint Photographic Experts Group 2000 \li Read/write \li Yes (bundled)
-\row \li MNG \li Multiple-image Network Graphics \li Read \li Yes (bundled)
+\row \li JP2 \li Joint Photographic Experts Group 2000 \li Read/write \li Yes (bundled, unmaintained)
+\row \li MNG \li Multiple-image Network Graphics \li Read \li Yes (bundled, unmaintained)
\row \li TGA \li Truevision Graphics Adapter \li Read \li No
\row \li TIFF \li Tagged Image File Format \li Read/write \li Yes (bundled)
\row \li WBMP \li Wireless Bitmap \li Read/write \li No
\row \li WEBP \li WebP \li Read/write \li Yes (bundled)
+\note Some bundled third party codecs are not maintained anymore. They are
+provided for manual builds only, and not used as a fallback in case system
+libraries are unavailable.
\section2 Deployment
When built, the Qt Image Formats plugins are located as dynamic