Merge pull request #60096 from qgis/backport-60095-to-release-3_34

[Backport release-3_34] qgsvectorlayer.h: move a documentation section to the appropriate place

Author: troopa81

python/PyQt6/core/auto_generated/vector/qgsvectorlayer.sip.in

@@ -144,6 +144,13 @@ attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains,
 spatial binary operators and the QGIS local “geomFromWKT, geomFromGML”
 geometry constructor functions.
 
+Also note:
+
+- You can use various functions available in the QGIS Expression list,
+  however the function must exist server side and have the same name and arguments to work.
+- Use the special $geometry parameter to provide the layer geometry column as input
+  into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
+
 OGC API Features data provider (oapif)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -163,13 +170,6 @@ The URI should be constructed using the :py:class:`QgsDataSourceUri` class with
 - maxNumFeatures=number: maximum number of features to retrieve (possibly across several multiple paging requests)
 - hideDownloadProgressDialog=1: to hide the download progress dialog.
 
-Also note:
-
-- You can use various functions available in the QGIS Expression list,
-  however the function must exist server side and have the same name and arguments to work.
-- Use the special $geometry parameter to provide the layer geometry column as input
-  into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
-
 Delimited text file data provider (delimitedtext)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

python/core/auto_generated/vector/qgsvectorlayer.sip.in

@@ -144,6 +144,13 @@ attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains,
 spatial binary operators and the QGIS local “geomFromWKT, geomFromGML”
 geometry constructor functions.
 
+Also note:
+
+- You can use various functions available in the QGIS Expression list,
+  however the function must exist server side and have the same name and arguments to work.
+- Use the special $geometry parameter to provide the layer geometry column as input
+  into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
+
 OGC API Features data provider (oapif)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -163,13 +170,6 @@ The URI should be constructed using the :py:class:`QgsDataSourceUri` class with
 - maxNumFeatures=number: maximum number of features to retrieve (possibly across several multiple paging requests)
 - hideDownloadProgressDialog=1: to hide the download progress dialog.
 
-Also note:
-
-- You can use various functions available in the QGIS Expression list,
-  however the function must exist server side and have the same name and arguments to work.
-- Use the special $geometry parameter to provide the layer geometry column as input
-  into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
-
 Delimited text file data provider (delimitedtext)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

src/core/vector/qgsvectorlayer.h

@@ -210,6 +210,13 @@ typedef QSet<int> QgsAttributeIds;
  * attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains, Overlaps, Within”
  * spatial binary operators and the QGIS local “geomFromWKT, geomFromGML”
  * geometry constructor functions.
+
+ * Also note:
+ *
+ * - You can use various functions available in the QGIS Expression list,
+ *   however the function must exist server side and have the same name and arguments to work.
+ * - Use the special $geometry parameter to provide the layer geometry column as input
+ *   into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
  *
  * \subsection oapif OGC API Features data provider (oapif)
  *
@@ -229,13 +236,6 @@ typedef QSet<int> QgsAttributeIds;
  * - maxNumFeatures=number: maximum number of features to retrieve (possibly across several multiple paging requests)
  * - hideDownloadProgressDialog=1: to hide the download progress dialog.
  *
- * Also note:
- *
- * - You can use various functions available in the QGIS Expression list,
- *   however the function must exist server side and have the same name and arguments to work.
- * - Use the special $geometry parameter to provide the layer geometry column as input
- *   into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
- *
  * \subsection delimitedtext Delimited text file data provider (delimitedtext)
  *
  * Accesses data in a delimited text file, for example CSV files generated by