Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	src/quick/util/qquickimageprovider.cpp

Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023

2 files changed, 15 insertions, 1 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 633cab8078..5fb0a9867e 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