Skip to content
GitLab
Commit f0aa37ba authored by Sergio Ahumada's avatar Sergio Ahumada
Browse files

Merge remote-tracking branch 'origin/stable' into dev 

Change-Id: I7a67d831d24b298dbf48a6cac2c5f7e519a4616a
parents d47d38d7 37e34e1f
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
dist/changes-5.3.0
+ 1
− 0
View file @ f0aa37ba
...@@ -22,3 +22,4 @@ information about a particular change. ...@@ -22,3 +22,4 @@ information about a particular change.
- Add read/write support for Direct Draw Surface images. - Add read/write support for Direct Draw Surface images.
- Add read/write support for ICNS images. - Add read/write support for ICNS images.
- Add read/write support for JPEG 2000 images. - Add read/write support for JPEG 2000 images.
- Add read/write support for WebP images.
src/imageformats/doc/src/qtimageformats.qdoc
+ 1
− 0
View file @ f0aa37ba
...@@ -59,6 +59,7 @@ libraries. If not found, it may fall back on using a bundled copy (in ...@@ -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 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 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 WBMP \li Wireless Bitmap \li Read/write \li No
\row \li WEBP \li WebP \li Read/write \li Yes (bundled)
\endtable \endtable
\section2 Deployment \section2 Deployment
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment