From 277147da5427363d2e6c72ef76b163b1bff803e2 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 12 Jun 2020 13:06:33 +0200 Subject: Do a small OpenGL-related revision of Image docs Change-Id: I47fe1826080269bcbca84f64c628c57df84534f8 Reviewed-by: Jonas Karlsson Reviewed-by: Eirik Aavitsland --- src/quick/items/qquickimage.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/quick/items/qquickimage.cpp') diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index c58454362c..7fa060b5cf 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -115,13 +115,13 @@ QQuickImagePrivate::QQuickImagePrivate() \clearfloat - \section1 OpenGL Texture Files + \section1 Compressed Texture Files - When the default OpenGL \l{Qt Quick Scene Graph}{scene graph} backend is in - use, images can also be supplied in compressed texture files. The content - must be a simple RGB(A) format 2D texture. Supported compression schemes - are only limited by the underlying OpenGL driver and GPU. The following - container file formats are supported: + When supported by the implementation of the underlying graphics API at run + time, images can also be supplied in compressed texture files. The content + must be a simple RGB(A) format 2D texture. Supported compression schemes are + only limited by the underlying driver and GPU. The following container file + formats are supported: \list \li \c PKM (since Qt 5.10) @@ -144,10 +144,10 @@ QQuickImagePrivate::QQuickImagePrivate() file can be found by appending any of the supported image file extensions to the \l source URL, then that file will be loaded. - If the OpenGL \l{Qt Quick Scene Graph}{scene graph} backend is in use, the - file search the attempts the OpenGL texture file extensions first. If the - search is unsuccessful, it attempts to search with the file extensions for - the \l{QImageReader::supportedImageFormats()}{conventional image file + The file search attempts to look for compressed texture container file + extensions first. If the search is unsuccessful, it attempts to search with + the file extensions for the + \l{QImageReader::supportedImageFormats()}{conventional image file types}. For example: \snippet qml/image-ext.qml ext @@ -532,7 +532,7 @@ qreal QQuickImage::paintedHeight() const The URL may be absolute, or relative to the URL of the component. - \sa QQuickImageProvider {OpenGL Texture Files} {Automatic Detection of File Extension} + \sa QQuickImageProvider {Compressed Texture Files} {Automatic Detection of File Extension} */ /*! -- cgit v1.2.3