Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	src/render/renderers/opengl/renderer/renderer.cpp
	tests/auto/render/textures/tst_textures.cpp

Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4

1 files changed, 14 insertions, 2 deletions

diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index fc62b76ff..5fd2f4169 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -1258,6 +1258,13 @@ void QTextureLoaderPrivate::updateGenerator()
    \brief Handles the texture loading and setting the texture's properties.
 */
 /*!
+   \qmltype TextureLoader
+   \instantiates Qt3DRender::QTextureLoader
+   \inqmlmodule Qt3D.Render
+
+   \brief Handles the texture loading and setting the texture's properties.
+*/
+/*!
  * Constructs a new Qt3DRender::QTextureLoader instance with \a parent as parent.
  *
  * Note that by default, if not contradicted by the file metadata, the loaded texture
@@ -1295,7 +1302,12 @@ QTextureLoader::~QTextureLoader()
 /*!
     \property QTextureLoader::source
 
-    Returns the current texture source.
+    \brief The current texture source.
+*/
+/*!
+    \qmlproperty url Qt3D.Render::TextureLoader::source
+
+    This property holds the current texture source.
 */
 QUrl QTextureLoader::source() const
 {
@@ -1347,7 +1359,7 @@ void QTextureLoader::setSource(const QUrl& source)
 */
 
 /*!
-  \qmlproperty bool Qt3DRender::QTextureLoader::mirrored
+  \qmlproperty bool Qt3D.Render::TextureLoader::mirrored
 
   This property specifies whether the texture should be mirrored when loaded. This
   is a convenience to avoid having to manipulate images to match the origin of