diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-21 14:26:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-21 14:30:29 +0200 |
| commit | cc1b216c52d42964c9ac816302414cc6ec376dfe (patch) | |
| tree | 4e282f89572881e963ca4aaf1f1dae44ec2d334a /src/quick/scenegraph/util | |
| parent | 0fadb710e5639dac9f17d6655eb9edeaadbcbc33 (diff) | |
| parent | 0af61d773fc7263573afc6b7a973451783bf7424 (diff) | |
Merge branch 'origin/5.4' into dev
This merges 0af61d773fc7263573afc6b7a973451783bf7424 since there is a
circular dependency introduced with a111b1b108f2d3344cb2b2b677e738fd9dd68945
in qtquickcontrols.
Change-Id: Ia4fcad8df69326fba3f6b5927151e9d98206e872
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 02dd2efae3..69edfab379 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -208,7 +208,7 @@ static void qt_debug_remove_texture(QSGTexture* texture) arbitrary input textures, such as YUV video frames or 8 bit alpha masks. The scene graph backend provides a default implementation of normal color textures. As the implementation of these may be - hardware specific, they are are constructed via the factory + hardware specific, they are constructed via the factory function QQuickWindow::createTextureFromImage(). The texture is a wrapper around an OpenGL texture, which texture |