aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2019-03-13 13:08:43 +0100
committerEirik Aavitsland <eirik.aavitsland@qt.io>2019-03-13 13:28:00 +0000
commit2b36b81feb76df1a2757d66321fad2d474d7f2fe (patch)
tree470ea0dc0b969413da673ea4eac342478928c010
parent44fbf97533e297b0871150b7b8689fe7a641ad51 (diff)
Doc: include support for astc compressed texture files
Change-Id: I939cba4ccdb5408a5a6a47f1324538462f51e35a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
-rw-r--r--src/quick/items/qquickimage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 2b71ad5f52..4a0936b4d5 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -132,6 +132,7 @@ QQuickImagePrivate::QQuickImagePrivate()
\list
\li \c PKM (since Qt 5.10)
\li \c KTX (since Qt 5.11)
+ \li \c ASTC (since Qt 5.13)
\endlist
\note Semi-transparent original images require alpha pre-multiplication
@@ -139,7 +140,7 @@ QQuickImagePrivate::QQuickImagePrivate()
Quick. This can be done with the following ImageMagick command
line:
\badcode
- convert MYORIGIMAGE \( +clone -alpha Extract \) -channel RGB -compose Multiply -composite MYPMIMAGE
+ convert foo.png \( +clone -alpha Extract \) -channel RGB -compose Multiply -composite foo_pm.png
\endcode
\section1 Automatic Detection of File Extension