diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
| commit | 4653217c3f36e7914f2cc0573347a078dd11768f (patch) | |
| tree | 7c7e862bdec55ae7ea0e2b6816bda189febbe4d1 /src/quick/doc | |
| parent | c5dcabeb6a07ed358e64f26cd8475bfe5daae0e4 (diff) | |
| parent | ad125bd18ef5c98a264b9e4fac258dd07511035d (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc index 0a8fc2ab0a..187085a5d8 100644 --- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc @@ -762,7 +762,7 @@ with multiple windows. faster to process in the renderer and faster to draw on the GPU. For instance, PNG files will often have an alpha channel, even though each pixel is fully opaque. JPG files are always opaque. When - providing images to an QQuickImageProvider or creating images with + providing images to a QQuickImageProvider or creating images with QQuickWindow::createTextureFromImage(), let the image have QImage::Format_RGB32, when possible. |