diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
| commit | 4fabebb332d8409b76e88edc74905f99119f0da4 (patch) | |
| tree | 7dff5241738b7ad5f46bdbbc0c01c2955ee1d5c1 /src/quick/scenegraph/util/qsgtextureprovider.cpp | |
| parent | 561b9323c22a594b402eac343690898d4e9c44d0 (diff) | |
| parent | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quick/util/qquickimageprovider.cpp
Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
Diffstat (limited to 'src/quick/scenegraph/util/qsgtextureprovider.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtextureprovider.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp index b9f9bde476..2d05e736fe 100644 --- a/src/quick/scenegraph/util/qsgtextureprovider.cpp +++ b/src/quick/scenegraph/util/qsgtextureprovider.cpp @@ -44,7 +44,15 @@ QT_BEGIN_NAMESPACE \sa {Scene Graph - Two Texture Providers} */ +/*! + \fn QSGTexture *QSGTextureProvider::texture(); + Returns a pointer to the texture object. + */ +/*! + \fn void QSGTextureProvider::textureChanged(); + This signal is emitted when the texture changes. + */ QT_END_NAMESPACE |