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

6 files changed, 118 insertions, 13 deletions

diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 000000000..2051540a8
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,26 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                Qt3DRender                                *
+****************************************************************************
+
+ - [QTBUG-69918] Add QSharedGLTexture to allow creating a Qt3D from an
+   OpenGL texture id.
+ - [QTBUG-70055] QAbstractTexture: Expose raw texture handle and handleType
+   to share with 3rdparty engines.
+ - QObjectPicker: add a priority based result selection
diff --git a/src/render/framegraph/qblitframebuffer.cpp b/src/render/framegraph/qblitframebuffer.cpp
index b0a29eab8..d0e1bdbf3 100644
--- a/src/render/framegraph/qblitframebuffer.cpp
+++ b/src/render/framegraph/qblitframebuffer.cpp
@@ -64,8 +64,62 @@ namespace Qt3DRender {
     \note In practice the QBlitFramebuffer node will often be used in
     combination with QNoDraw since a blit should not involve issuing draw calls
     for any entities.
+
+*/
+/*!
+    \enum Qt3DRender::QBlitFramebuffer::InterpolationMethod
+
+    Specifies the interpolation applied if the image is stretched.
+
+*/
+/*!
+    \property Qt3DRender::QBlitFramebuffer::destination
+
+    Specifies the destination render target. When not set, the destination
+    is assumed to be the default framebuffer (i.e. the backbuffer of
+    the current surface), if there is one.
+
+    \note the source and destination must not refer to the same render
+          target.
+*/
+/*!
+
+    \property Qt3DRender::QBlitFramebuffer::destinationAttachmentPoint
+
+    Specifies the target attachment point.
+*/
+
+/*!
+    \property Qt3DRender::QBlitFramebuffer::destinationRect
+
+    Specifies the destination rectangle. The coordinates are assumed to follow
+    the normal Qt coordinate system, meaning Y runs from top to bottom.
+*/
+
+/*!
+    \property Qt3DRender::QBlitFramebuffer::source
+
+    Specifies the source render target. When not set, the source is assumed to
+    be the default framebuffer (i.e. the backbuffer of the current surface), if
+    there is one.
+
+    \note the source and destination must not refer to the same render target.
+
+*/
+/*!
+    \property Qt3DRender::QBlitFramebuffer::sourceAttachmentPoint
+
+    Specifies the source attachment point.
+
+*/
+/*!
+    \property Qt3DRender::QBlitFramebuffer::sourceRect
+
+    Specifies the source rectangle. The coordinates are assumed to follow the
+    normal Qt coordinate system, meaning Y runs from top to bottom.
  */
 
+
 /*!
     \qmltype BlitFramebuffer
     \inqmlmodule Qt3D.Render
diff --git a/src/render/frontend/qabstractfunctor.cpp b/src/render/frontend/qabstractfunctor.cpp
index 4be1da595..698c3a291 100644
--- a/src/render/frontend/qabstractfunctor.cpp
+++ b/src/render/frontend/qabstractfunctor.cpp
@@ -58,8 +58,15 @@ namespace Qt3DRender {
  */
 /*!
     \fn qintptr Qt3DRender::QAbstractFunctor::id() const
+
+    Returns a pointer to the id of the functor.
  */
 /*!
+   \fn qintptr Qt3DRender::functorTypeId()
+
+   Returns a pointer to the type id of the functor.
+*/
+/*!
     \macro QT3D_FUNCTOR(Class)
     \relates Qt3DRender::QAbstractFunctor
 
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp
index 6c8c0113a..bc6b27851 100644
--- a/src/render/geometry/attribute.cpp
+++ b/src/render/geometry/attribute.cpp
@@ -100,6 +100,17 @@ void Attribute::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch
     m_attributeDirty = true;
 }
 
+/*!
+    \fn Qt3DRender::QAttribute::dataSizeChanged(uint vertexSize)
+
+    The signal is emitted with \a vertexSize when the dataSize changes.
+
+*/
+/*!
+    \fn Qt3DRender::QAttribute::dataTypeChanged(Qt3DRender::QAttribute::VertexBaseType vertexBaseType)
+
+    The signal is emitted with \a vertexBaseType when the dataType changed.
+*/
 void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
diff --git a/src/render/picking/qabstractraycaster.cpp b/src/render/picking/qabstractraycaster.cpp
index 5f4c4c490..ab0916401 100644
--- a/src/render/picking/qabstractraycaster.cpp
+++ b/src/render/picking/qabstractraycaster.cpp
@@ -58,6 +58,10 @@ QAbstractRayCasterPrivate::QAbstractRayCasterPrivate()
     m_shareable = false;
 }
 
+/*!
+    \property Qt3DRender::QAbstractRayCaster::Hits
+*/
+
 QAbstractRayCasterPrivate *QAbstractRayCasterPrivate::get(QAbstractRayCaster *obj)
 {
     return obj->d_func();
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index e1b9cc0bb..399314f24 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -425,7 +425,7 @@ void QAbstractTexture::setDepth(int depth)
 }
 
 /*!
- * \return the width of the texture
+ * Returns the width of the texture
  */
 int QAbstractTexture::width() const
 {
@@ -434,7 +434,7 @@ int QAbstractTexture::width() const
 }
 
 /*!
- * \return the height of the texture
+ * Returns the height of the texture
  */
 int QAbstractTexture::height() const
 {
@@ -443,7 +443,7 @@ int QAbstractTexture::height() const
 }
 
 /*!
- * \return the depth of the texture
+ * Returns the depth of the texture
  */
 int QAbstractTexture::depth() const
 {
@@ -473,7 +473,7 @@ void QAbstractTexture::setLayers(int layers)
 }
 
 /*!
-    \return the maximum number of layers for the texture provider.
+    Returns the maximum number of layers for the texture provider.
 
     \note this has a meaning only for texture providers that have 3D or
      array target formats.
@@ -506,7 +506,7 @@ void QAbstractTexture::setSamples(int samples)
 }
 
 /*!
-    \return the number of samples per texel for the texture provider.
+    Returns the number of samples per texel for the texture provider.
 
     \note this has a meaning only for texture providers that have multisample
     formats.
@@ -600,7 +600,7 @@ void QAbstractTexture::setHandleType(QAbstractTexture::HandleType type)
 }
 
 /*!
- * \return the current status of the texture provider.
+ * Returns the current status of the texture provider.
  */
 QAbstractTexture::Status QAbstractTexture::status() const
 {
@@ -702,7 +702,7 @@ void QAbstractTexture::removeTextureImage(QAbstractTextureImage *textureImage)
 }
 
 /*!
-    \return a list of pointers to QAbstractTextureImage objects contained in
+    Returns a list of pointers to QAbstractTextureImage objects contained in
     the texture provider.
  */
 QVector<QAbstractTextureImage *> QAbstractTexture::textureImages() const
@@ -856,7 +856,7 @@ void QAbstractTexture::setMaximumAnisotropy(float anisotropy)
 }
 
 /*!
- * \return the current maximum anisotropy
+ * Returns the current maximum anisotropy
  */
 float QAbstractTexture::maximumAnisotropy() const
 {
@@ -865,7 +865,7 @@ float QAbstractTexture::maximumAnisotropy() const
 }
 
 /*!
-    \property Qt3DRender::QAbstractTexture::comparisonFunction
+    \property Qt3DRender::QAbstractTexture::ComparisonFunction
 
     Holds the comparison function of the texture provider.
  */
@@ -882,7 +882,7 @@ void QAbstractTexture::setComparisonFunction(QAbstractTexture::ComparisonFunctio
 }
 
 /*!
- * \return the current comparison function.
+ * Returns the current comparison function.
  */
 QAbstractTexture::ComparisonFunction QAbstractTexture::comparisonFunction() const
 {
@@ -891,7 +891,7 @@ QAbstractTexture::ComparisonFunction QAbstractTexture::comparisonFunction() cons
 }
 
 /*!
-    \property Qt3DRender::QAbstractTexture::comparisonMode
+    \property Qt3DRender::QAbstractTexture::ComparisonMode
 
     Holds the comparison mode of the texture provider.
  */
@@ -908,7 +908,7 @@ void QAbstractTexture::setComparisonMode(QAbstractTexture::ComparisonMode mode)
 }
 
 /*!
- * \return the current comparison mode.
+ * Returns the current comparison mode.
  */
 QAbstractTexture::ComparisonMode QAbstractTexture::comparisonMode() const
 {
@@ -917,7 +917,7 @@ QAbstractTexture::ComparisonMode QAbstractTexture::comparisonMode() const
 }
 
 /*!
- * \return the current data generator.
+ * Returns the current data generator.
  */
 QTextureGeneratorPtr QAbstractTexture::dataGenerator() const
 {
@@ -1023,6 +1023,9 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAbstractTexture::createNodeCreationChange()
     return creationChange;
 }
 
+/*!
+    A function for receiving and processing a \a change.
+*/
 void QAbstractTexture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     switch (change->type()) {