diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-08-03 13:47:11 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-11-02 10:47:23 +0000 |
| commit | 65197439337ddf9efcfcdbc3223573858e5fe611 (patch) | |
| tree | 1a4e2aa972e97058b1bab8e0c67df64dcacf878c /src/quick/scenegraph | |
| parent | 5c53861cced2d40490e4c7bfc202aadc532df4c2 (diff) | |
Doc: added documentation to undocumented functions
Task-number: QTBUG-36985
Change-Id: I219375d405fbfb53611c0138698e955d9cd5d821
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 8 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgtextureprovider.cpp | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index c68c0b93d2..367c0b1ee5 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -188,6 +188,9 @@ QSGMaterialShader::QSGMaterialShader() { } +/*! + \internal + */ QSGMaterialShader::QSGMaterialShader(QSGMaterialShaderPrivate &dd) : d_ptr(&dd) { @@ -463,7 +466,10 @@ QMatrix4x4 QSGMaterialShader::RenderState::combinedMatrix() const Q_ASSERT(m_data); return static_cast<const QSGRenderer *>(m_data)->currentCombinedMatrix(); } - +/*! + Returns the ratio between physical pixels and device-independent pixels + to be used for rendering. +*/ float QSGMaterialShader::RenderState::devicePixelRatio() const { Q_ASSERT(m_data); 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 |