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

 Conflicts:
	src/qml/jsruntime/qv4functionobject_p.h

Change-Id: I4bbed45f1fe02cf64df3c8a5f92f811e38e772f3

2 files changed, 5 insertions, 8 deletions

diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp
index 7214a255df..f29c58ad9e 100644
--- a/src/quick/scenegraph/util/qsgsimplematerial.cpp
+++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp
@@ -194,19 +194,15 @@
 /*!
     \fn const char *QSGSimpleMaterialShader::uniformMatrixName() const
 
-    Reimplement this function to give a different name to the uniform for
-    item transformation. The default value is \c qt_Matrix.
-
+    Returns the name for the transform matrix uniform of this item.
+    The default value is \c qt_Matrix.
  */
 
 /*!
     \fn const char *QSGSimpleMaterialShader::uniformOpacityName() const
 
-    Reimplement this function to give a different name to the uniform for
-    item opacity. The default value is \c qt_Opacity.
-
-    If the shader program does not implement the item opacity, the
-    implemented function should return a null pointer.
+    Returns the name for the opacity uniform of this item.
+    The default value is \c qt_Opacity.
  */
 
 /*!
diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h
index 0e7219d7bd..b5b8815b4a 100644
--- a/src/quick/scenegraph/util/qsgsimplematerial.h
+++ b/src/quick/scenegraph/util/qsgsimplematerial.h
@@ -71,6 +71,7 @@ public:
         resolveUniforms();
     }
 
+    // ### Qt 6: make both virtual and fix docs
     const char *uniformMatrixName() const { return "qt_Matrix"; }
     const char *uniformOpacityName() const { return "qt_Opacity"; }