Merge master into fix_mixed_layer_oracle

external/mdal/mdal.cpp

@@ -22,7 +22,7 @@ static MDAL_Status sLastStatus;
 
 const char *MDAL_Version()
 {
-  return "0.4.95";
+  return "0.5.0";
 }
 
 MDAL_Status MDAL_LastStatus()

python/core/auto_generated/layout/qgslayoutitempicture.sip.in

@@ -153,7 +153,7 @@ Sets the ``offset`` added to the picture's rotation from a map's North.
 
     ResizeMode resizeMode() const;
 %Docstring
-Returns the resize mode used for drawing the picture within the composer
+Returns the resize mode used for drawing the picture within the layout
 item's frame.
 
 .. seealso:: :py:func:`setResizeMode`

python/core/auto_generated/layout/qgslayouttable.sip.in

@@ -22,7 +22,7 @@ typedef QVector< QgsLayoutTableColumn * > QgsLayoutTableColumns;
 class QgsLayoutTableStyle
 {
 %Docstring
-Styling option for a composer table cell
+Styling option for a layout table cell
 
 .. versionadded:: 3.0
 %End

python/core/auto_generated/layout/qgslayouttablecolumn.sip.in

@@ -199,7 +199,7 @@ Sets the sort ``rank`` for the column. If the sort rank is > 0 then the column
 will be sorted in the table. The sort rank specifies the priority given to the
 column when the table is sorted by multiple columns, with lower sort ranks
 having higher priority. This property is only used when the column
-is part of a :py:class:`QgsComposerAttributeTable`.
+is part of a :py:class:`QgsLayoutItemAttributeTable`.
 If the sort ``rank`` is <= 0 then the column is not being sorted.
 
 .. note::

python/core/auto_generated/qgsdatadefinedsizelegend.sip.in

@@ -150,7 +150,7 @@ Updates the list of classes, source symbol and title label from given symbol and
 Generates legend symbol items according to the configuration
 %End
 
-    void drawCollapsedLegend( QgsRenderContext &context, QSize *outputSize /Out/ = 0, int *labelXOffset /Out/ = 0 ) const;
+    void drawCollapsedLegend( QgsRenderContext &context, QSizeF *outputSize /Out/ = 0, double *labelXOffset /Out/ = 0 ) const;
 %Docstring
 Draw the legend if using LegendOneNodeForAll and optionally output size of the legend and x offset of labels (in painter units).
 If the painter in context is ``None``, it only does size calculation without actual rendering.

python/core/auto_generated/qgsproject.sip.in

@@ -575,7 +575,7 @@ an absolute path.
 
     QgsLayoutManager *layoutManager();
 %Docstring
-Returns the project's layout manager, which manages compositions within
+Returns the project's layout manager, which manages print layouts, atlases and reports within
 the project.
 
 .. versionadded:: 3.0

python/core/auto_generated/qgsrendercontext.sip.in

@@ -282,11 +282,15 @@ of any faster raster shortcuts.
     bool useAdvancedEffects() const;
 %Docstring
 Returns ``True`` if advanced effects such as blend modes such be used
+
+.. seealso:: :py:func:`setUseAdvancedEffects`
 %End
 
     void setUseAdvancedEffects( bool enabled );
 %Docstring
 Used to enable or disable advanced effects such as blend modes
+
+.. seealso:: :py:func:`useAdvancedEffects`
 %End
 
     bool drawEditingInformation() const;
@@ -479,9 +483,16 @@ Sets whether vector selections should be shown in the rendered map
     bool useRenderingOptimization() const;
 %Docstring
 Returns ``True`` if the rendering optimization (geometry simplification) can be executed
+
+.. seealso:: :py:func:`setUseRenderingOptimization`
 %End
 
     void setUseRenderingOptimization( bool enabled );
+%Docstring
+Sets whether the rendering optimization (geometry simplification) should be executed
+
+.. seealso:: :py:func:`useRenderingOptimization`
+%End
 
     const QgsVectorSimplifyMethod &vectorSimplifyMethod() const;
 %Docstring
@@ -565,22 +576,36 @@ Gets the filter feature provider used for additional filtering of rendered featu
 %Docstring
 Sets the segmentation tolerance applied when rendering curved geometries
 
-:param tolerance: the segmentation tolerance*
+:param tolerance: the segmentation tolerance
+
+.. seealso:: :py:func:`segmentationTolerance`
+
+.. seealso:: :py:func:`segmentationToleranceType`
 %End
+
     double segmentationTolerance() const;
 %Docstring
 Gets the segmentation tolerance applied when rendering curved geometries
+
+.. seealso:: :py:func:`setSegmentationTolerance`
 %End
 
     void setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type );
 %Docstring
 Sets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)
 
-:param type: the segmentation tolerance typename*
+:param type: the segmentation tolerance typename
+
+.. seealso:: :py:func:`segmentationToleranceType`
+
+.. seealso:: :py:func:`segmentationTolerance`
 %End
+
     QgsAbstractGeometry::SegmentationToleranceType segmentationToleranceType() const;
 %Docstring
 Gets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)
+
+.. seealso:: :py:func:`setSegmentationToleranceType`
 %End
 
 

python/gui/auto_generated/qgscolorbutton.sip.in

@@ -415,6 +415,8 @@ Sets color to null.
 
 .. seealso:: :py:func:`setToNoColor`
 
+.. seealso:: :py:func:`cleared`
+
 .. versionadded:: 2.16
 %End
 
@@ -448,6 +450,15 @@ Emitted when the button is clicked, if the button's behavior is set to SignalOnl
 .. seealso:: :py:func:`setBehavior`
 
 .. seealso:: :py:func:`behavior`
+%End
+
+    void cleared();
+%Docstring
+Emitted when the color is cleared (set to null).
+
+.. seealso:: :py:func:`setToNull`
+
+.. versionadded:: 3.12
 %End
 
     void unlinked();

python/gui/auto_generated/qgsmapcanvas.sip.in

@@ -1020,6 +1020,13 @@ This signal will be emitted during a pan operation as the user moves the map,
 giving the total distance and bearing between the map position at the
 start of the pan and the current pan position.
 
+.. versionadded:: 3.12
+%End
+
+    void tapAndHoldGestureOccurred( const QgsPointXY &mapPoint, QTapAndHoldGesture *gesture );
+%Docstring
+Emitted whenever a tap and hold ``gesture`` occurs at the specified map point.
+
 .. versionadded:: 3.12
 %End
 

python/plugins/processing/tests/testdata/expected/mbg_rect_field.gml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ogr:FeatureCollection
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation=""
+     xsi:schemaLocation="http://ogr.maptools.org/ mbg_rect_field.xsd"
      xmlns:ogr="http://ogr.maptools.org/"
      xmlns:gml="http://www.opengis.net/gml">
   <gml:boundedBy>
     <gml:Box>
       <gml:coord><gml:X>-2.056603773584904</gml:X><gml:Y>-3</gml:Y></gml:coord>
-      <gml:coord><gml:X>9.162955854126681</gml:X><gml:Y>6.088675623800386</gml:Y></gml:coord>
+      <gml:coord><gml:X>9.162955854126682</gml:X><gml:Y>6.489909219550769</gml:Y></gml:coord>
     </gml:Box>
   </gml:boundedBy>
 
@@ -25,26 +25,26 @@
   </gml:featureMember>
   <gml:featureMember>
     <ogr:mbg_rect_field fid="mbg_rect_field.1">
-      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5.24145873320538,-0.054510556621882 5.24145873320538,-1.05451055662188 7.24145873320538,-1.05451055662188 7.24145873320538,-0.054510556621882 5.24145873320538,-0.054510556621882</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5.24145873320538,-1.05451055662188 6.24145873320538,-2.05451055662188 7.24145873320538,-1.05451055662188 6.24145873320538,-0.054510556621882 5.24145873320538,-1.05451055662188</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
       <ogr:id>1</ogr:id>
       <ogr:name>dd</ogr:name>
-      <ogr:width>1.000000</ogr:width>
-      <ogr:height>2.000000</ogr:height>
-      <ogr:angle>90.000000</ogr:angle>
+      <ogr:width>1.414214</ogr:width>
+      <ogr:height>1.414214</ogr:height>
+      <ogr:angle>45.000000</ogr:angle>
       <ogr:area>2.000000</ogr:area>
-      <ogr:perimeter>6.000000</ogr:perimeter>
+      <ogr:perimeter>5.656854</ogr:perimeter>
     </ogr:mbg_rect_field>
   </gml:featureMember>
   <gml:featureMember>
     <ogr:mbg_rect_field fid="mbg_rect_field.2">
-      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>2.0,6.08867562380039 2.0,4.4236084452975 5.1725527831094,4.4236084452975 5.1725527831094,6.08867562380039 2.0,6.08867562380039</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5.34748915030878,4.7278689643513 5.06593031585745,6.48990921955077 1.84418704183259,5.97510243323637 2.12574587628392,4.2130621780369 5.34748915030878,4.7278689643513</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
       <ogr:id>2</ogr:id>
       <ogr:name>bb</ogr:name>
-      <ogr:width>1.665067</ogr:width>
-      <ogr:height>3.172553</ogr:height>
-      <ogr:angle>90.000000</ogr:angle>
-      <ogr:area>5.282514</ogr:area>
-      <ogr:perimeter>9.675240</ogr:perimeter>
+      <ogr:width>1.784394</ogr:width>
+      <ogr:height>3.262615</ogr:height>
+      <ogr:angle>80.921378</ogr:angle>
+      <ogr:area>5.821790</ogr:area>
+      <ogr:perimeter>10.094017</ogr:perimeter>
     </ogr:mbg_rect_field>
   </gml:featureMember>
   <gml:featureMember>