diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-10 17:37:25 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-10 17:37:25 +0100 |
| commit | f0aa37bae99f9c1d374afa3fb2fd21239dabb400 (patch) | |
| tree | d88a647352b1ce240ed4c3f756b1ccebcc082ac4 | |
| parent | d47d38d7d718673e2c3673bb13fa158446ae8fba (diff) | |
| parent | 37e34e1f363582e2ccfdfb059251475242b5697f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7a67d831d24b298dbf48a6cac2c5f7e519a4616a
| -rw-r--r-- | dist/changes-5.3.0 | 1 | ||||
| -rw-r--r-- | src/imageformats/doc/src/qtimageformats.qdoc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/dist/changes-5.3.0 b/dist/changes-5.3.0 index 026d568..ff0da97 100644 --- a/dist/changes-5.3.0 +++ b/dist/changes-5.3.0 @@ -22,3 +22,4 @@ information about a particular change. - Add read/write support for Direct Draw Surface images. - Add read/write support for ICNS images. - Add read/write support for JPEG 2000 images. + - Add read/write support for WebP images. diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc index 86cdd53..3a4d6d3 100644 --- a/src/imageformats/doc/src/qtimageformats.qdoc +++ b/src/imageformats/doc/src/qtimageformats.qdoc @@ -59,6 +59,7 @@ libraries. If not found, it may fall back on using a bundled copy (in \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) \endtable \section2 Deployment |