Import/export 'DXF Export' dialog settings from/to XML

.github/workflows/macos-build.yml

@@ -135,4 +135,4 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: build-ccache-mac-${{ github.ref_name }}
+          key: build-ccache-mac-${{ github.ref_name }}-${{ github.run_id }}

.github/workflows/mingw-w64-msys2.yml

@@ -91,4 +91,4 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: build
-          key: build-ccache-mingw64-msys2-${{ github.ref_name }}
+          key: build-ccache-mingw64-msys2-${{ github.ref_name }}-${{ github.run_id }}

.github/workflows/mingw64.yml

@@ -79,7 +79,7 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: /w/.ccache/QGIS
-          key: build-ccache-mingw64-${{ github.ref_name }}
+          key: build-ccache-mingw64-${{ github.ref_name }}-${{ github.run_id }}
 
       - name: Create Portable zip
         run: |

.github/workflows/ogc.yml

@@ -76,7 +76,7 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: /home/runner/QGIS/.ccache
-          key: build-ccache-ogc-${{ github.ref_name }}
+          key: build-ccache-ogc-${{ github.ref_name }}-${{ github.run_id }}
 
       - name: Install pyogctest
         run: |

.github/workflows/run-tests.yml

@@ -141,7 +141,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: /home/runner/QGIS/.ccache
-          key: build-ccache-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-${{ github.event.pull_request.base.ref || github.ref_name }}
+          key: build-ccache-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-${{ github.event.pull_request.base.ref || github.ref_name }}
           restore-keys: |
             build-ccache-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-master
 
@@ -173,7 +173,7 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: /home/runner/QGIS/.ccache
-          key: build-ccache-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-${{ github.ref_name }}
+          key: build-ccache-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-${{ github.ref_name }}-${{ github.run_id }}
 
       - name: Push artifact
         id: push_artifact

CMakeLists.txt

@@ -375,9 +375,6 @@ if(WITH_CORE)
 
   find_package(Protobuf CONFIG)
   find_package(Protobuf REQUIRED)
-  if(Protobuf_VERSION GREATER_EQUAL 4.23)
-    set(Protobuf_LITE_LIBRARY protobuf::libprotobuf-lite)
-  endif()
 
   message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
   if (NOT Protobuf_PROTOC_EXECUTABLE)

python/PyQt6/core/auto_additions/qgis.py

@@ -1279,6 +1279,14 @@
 Qgis.RasterRendererFlags.baseClass = Qgis
 RasterRendererFlags = Qgis  # dirty hack since SIP seems to introduce the flags in module
 # monkey patching scoped based enum
+Qgis.RasterRendererCapability.UsesMultipleBands.__doc__ = "The renderer utilizes multiple raster bands for color data (note that alpha bands are not considered for this capability)"
+Qgis.RasterRendererCapability.__doc__ = "Raster renderer capabilities.\n\n.. versionadded:: 3.48\n\n" + '* ``UsesMultipleBands``: ' + Qgis.RasterRendererCapability.UsesMultipleBands.__doc__
+# --
+Qgis.RasterRendererCapability.baseClass = Qgis
+Qgis.RasterRendererCapabilities = lambda flags=0: Qgis.RasterRendererCapability(flags)
+Qgis.RasterRendererCapabilities.baseClass = Qgis
+RasterRendererCapabilities = Qgis  # dirty hack since SIP seems to introduce the flags in module
+# monkey patching scoped based enum
 Qgis.RasterAttributeTableFieldUsage.Generic.__doc__ = "Field usage Generic"
 Qgis.RasterAttributeTableFieldUsage.PixelCount.__doc__ = "Field usage PixelCount"
 Qgis.RasterAttributeTableFieldUsage.Name.__doc__ = "Field usage Name"
@@ -3220,6 +3228,27 @@
 # --
 Qgis.AltitudeBinding.baseClass = Qgis
 # monkey patching scoped based enum
+Qgis.RangeLimits.IncludeBoth.__doc__ = "Both lower and upper values are included in the range"
+Qgis.RangeLimits.IncludeLowerExcludeUpper.__doc__ = "Lower value is included in the range, upper value is excluded"
+Qgis.RangeLimits.ExcludeLowerIncludeUpper.__doc__ = "Lower value is excluded from the range, upper value in inccluded"
+Qgis.RangeLimits.ExcludeBoth.__doc__ = "Both lower and upper values are excluded from the range"
+Qgis.RangeLimits.__doc__ = "Describes how the limits of a range are handled.\n\n.. versionadded:: 3.38\n\n" + '* ``IncludeBoth``: ' + Qgis.RangeLimits.IncludeBoth.__doc__ + '\n' + '* ``IncludeLowerExcludeUpper``: ' + Qgis.RangeLimits.IncludeLowerExcludeUpper.__doc__ + '\n' + '* ``ExcludeLowerIncludeUpper``: ' + Qgis.RangeLimits.ExcludeLowerIncludeUpper.__doc__ + '\n' + '* ``ExcludeBoth``: ' + Qgis.RangeLimits.ExcludeBoth.__doc__
+# --
+Qgis.RangeLimits.baseClass = Qgis
+# monkey patching scoped based enum
+Qgis.RasterElevationMode.FixedElevationRange.__doc__ = "Layer has a fixed elevation range"
+Qgis.RasterElevationMode.RepresentsElevationSurface.__doc__ = "Pixel values represent an elevation surface"
+Qgis.RasterElevationMode.FixedRangePerBand.__doc__ = "Layer has a fixed elevation range per band"
+Qgis.RasterElevationMode.__doc__ = "Raster layer elevation modes.\n\n.. versionadded:: 3.38\n\n" + '* ``FixedElevationRange``: ' + Qgis.RasterElevationMode.FixedElevationRange.__doc__ + '\n' + '* ``RepresentsElevationSurface``: ' + Qgis.RasterElevationMode.RepresentsElevationSurface.__doc__ + '\n' + '* ``FixedRangePerBand``: ' + Qgis.RasterElevationMode.FixedRangePerBand.__doc__
+# --
+Qgis.RasterElevationMode.baseClass = Qgis
+# monkey patching scoped based enum
+Qgis.MeshElevationMode.FixedElevationRange.__doc__ = "Layer has a fixed elevation range"
+Qgis.MeshElevationMode.FromVertices.__doc__ = "Elevation should be taken from mesh vertices"
+Qgis.MeshElevationMode.__doc__ = "Mesh layer elevation modes.\n\n.. versionadded:: 3.38\n\n" + '* ``FixedElevationRange``: ' + Qgis.MeshElevationMode.FixedElevationRange.__doc__ + '\n' + '* ``FromVertices``: ' + Qgis.MeshElevationMode.FromVertices.__doc__
+# --
+Qgis.MeshElevationMode.baseClass = Qgis
+# monkey patching scoped based enum
 Qgis.NoConstraint = Qgis.BetweenLineConstraint.NoConstraint
 Qgis.NoConstraint.is_monkey_patched = True
 Qgis.BetweenLineConstraint.NoConstraint.__doc__ = "No additional constraint"

python/PyQt6/core/auto_generated/mesh/qgsmeshlayerelevationproperties.sip.in

@@ -46,6 +46,62 @@ Constructor for QgsMeshLayerElevationProperties, with the specified ``parent`` o
 
     virtual bool showByDefaultInElevationProfilePlots() const;
 
+    virtual QgsMapLayerElevationProperties::Flags flags() const;
+
+
+    Qgis::MeshElevationMode mode() const;
+%Docstring
+Returns the elevation mode.
+
+.. seealso:: :py:func:`setMode`
+
+.. versionadded:: 3.38
+%End
+
+    void setMode( Qgis::MeshElevationMode mode );
+%Docstring
+Sets the elevation ``mode``.
+
+.. seealso:: :py:func:`mode`
+
+.. versionadded:: 3.38
+%End
+
+    QgsDoubleRange fixedRange() const;
+%Docstring
+Returns the fixed elevation range for the mesh.
+
+.. note::
+
+   This is only considered when :py:func:`~QgsMeshLayerElevationProperties.mode` is :py:class:`Qgis`.MeshElevationMode.FixedElevationRange.
+
+.. note::
+
+   When a fixed range is set any :py:func:`~QgsMeshLayerElevationProperties.zOffset` and :py:func:`~QgsMeshLayerElevationProperties.zScale` is ignored.
+
+
+.. seealso:: :py:func:`setFixedRange`
+
+.. versionadded:: 3.38
+%End
+
+    void setFixedRange( const QgsDoubleRange &range );
+%Docstring
+Sets the fixed elevation ``range`` for the mesh.
+
+.. note::
+
+   This is only considered when :py:func:`~QgsMeshLayerElevationProperties.mode` is :py:class:`Qgis`.MeshElevationMode.FixedElevationRange.
+
+.. note::
+
+   When a fixed range is set any :py:func:`~QgsMeshLayerElevationProperties.zOffset` and :py:func:`~QgsMeshLayerElevationProperties.zScale` is ignored.
+
+
+.. seealso:: :py:func:`fixedRange`
+
+.. versionadded:: 3.38
+%End
 
     QgsLineSymbol *profileLineSymbol() const;
 %Docstring

python/PyQt6/core/auto_generated/qgis.sip.in

@@ -691,6 +691,14 @@ The development version
 
 
 
+    enum class RasterRendererCapability /BaseType=IntFlag/
+    {
+      UsesMultipleBands,
+    };
+
+    typedef QFlags<Qgis::RasterRendererCapability> RasterRendererCapabilities;
+
+
     enum class RasterAttributeTableFieldUsage /BaseType=IntEnum/
     {
       Generic,
@@ -1835,6 +1843,27 @@ The development version
       Centroid,
     };
 
+    enum class RangeLimits /BaseType=IntEnum/
+    {
+      IncludeBoth,
+      IncludeLowerExcludeUpper,
+      ExcludeLowerIncludeUpper,
+      ExcludeBoth,
+    };
+
+    enum class RasterElevationMode /BaseType=IntEnum/
+    {
+      FixedElevationRange,
+      RepresentsElevationSurface,
+      FixedRangePerBand,
+    };
+
+    enum class MeshElevationMode /BaseType=IntEnum/
+    {
+      FixedElevationRange,
+      FromVertices
+    };
+
     enum class BetweenLineConstraint /BaseType=IntEnum/
     {
       NoConstraint,
@@ -2844,6 +2873,8 @@ QFlags<Qgis::ProjectReadFlag> operator|(Qgis::ProjectReadFlag f1, QFlags<Qgis::P
 
 QFlags<Qgis::RasterRendererFlag> operator|(Qgis::RasterRendererFlag f1, QFlags<Qgis::RasterRendererFlag> f2);
 
+QFlags<Qgis::RasterRendererCapability> operator|(Qgis::RasterRendererCapability f1, QFlags<Qgis::RasterRendererCapability> f2);
+
 QFlags<Qgis::RasterTemporalCapabilityFlag> operator|(Qgis::RasterTemporalCapabilityFlag f1, QFlags<Qgis::RasterTemporalCapabilityFlag> f2);
 
 QFlags<Qgis::RelationshipCapability> operator|(Qgis::RelationshipCapability f1, QFlags<Qgis::RelationshipCapability> f2);

python/PyQt6/core/auto_generated/qgsrange.sip.in

@@ -41,6 +41,14 @@ whether ranges overlap or during calculation of range intersections.
 %Docstring
 Constructor for QgsRange. The ``lower`` and ``upper`` bounds are specified,
 and optionally whether or not these bounds are included in the range.
+%End
+
+    QgsRange( T lower, T upper, Qgis::RangeLimits limits );
+%Docstring
+Constructor for QgsRange. The ``lower`` and ``upper`` bounds are specified,
+and whether or not these bounds are included in the range.
+
+.. versionadded:: 3.38
 %End
 
     T lower() const;
@@ -79,6 +87,13 @@ bound is exclusive.
 .. seealso:: :py:func:`upper`
 
 .. seealso:: :py:func:`includeLower`
+%End
+
+    Qgis::RangeLimits rangeLimits() const;
+%Docstring
+Returns the limit handling of the range.
+
+.. versionadded:: 3.38
 %End
 
     bool isEmpty() const;
@@ -146,6 +161,14 @@ typedef QgsRange<double> QgsRangedoubleBase;
 %End
   public:
 
+    QgsDoubleRange( double lower, double upper, Qgis::RangeLimits limits );
+%Docstring
+Constructor for QgsDoubleRange. The ``lower`` and ``upper`` bounds are specified,
+and whether or not these bounds are included in the range.
+
+.. versionadded:: 3.38
+%End
+
 
     QgsDoubleRange( double lower,
                     double upper,
@@ -207,6 +230,14 @@ typedef QgsRange<int> QgsRangeintBase;
 %End
   public:
 
+    QgsIntRange( int lower, int upper, Qgis::RangeLimits limits );
+%Docstring
+Constructor for QgsIntRange. The ``lower`` and ``upper`` bounds are specified,
+and whether or not these bounds are included in the range.
+
+.. versionadded:: 3.38
+%End
+
 
     QgsIntRange( int lower,
                  int upper,

python/PyQt6/core/auto_generated/raster/qgshillshaderenderer.sip.in

@@ -56,21 +56,31 @@ Factory method to create a new renderer
 
     virtual QList<int> usesBands() const;
 
+    virtual int inputBand() const;
+
 
     virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;
 
 
-    int band() const;
+ int band() const /Deprecated/;
 %Docstring
 Returns the band used by the renderer
+
+.. deprecated:: QGIS 3.38
+   use :py:func:`~QgsHillshadeRenderer.inputBand` instead
 %End
 
-    void setBand( int bandNo );
+ void setBand( int bandNo ) /Deprecated/;
 %Docstring
 Sets the band used by the renderer.
 
 .. seealso:: :py:func:`band`
+
+.. deprecated:: QGIS 3.38
+   use :py:func:`~QgsHillshadeRenderer.setInputBand` instead
 %End
+    virtual bool setInputBand( int band );
+
 
     double azimuth() const;
 %Docstring

python/PyQt6/core/auto_generated/raster/qgspalettedrasterrenderer.sip.in

@@ -122,11 +122,19 @@ Returns optional category label
 Set category label
 %End
 
-    int band() const;
+ int band() const /Deprecated/;
 %Docstring
 Returns the raster band used for rendering the raster.
+
+.. deprecated:: QGIS 3.38
+   use :py:func:`~QgsPalettedRasterRenderer.inputBand` instead
 %End
 
+    virtual int inputBand() const;
+
+    virtual bool setInputBand( int band );
+
+
     virtual void writeXml( QDomDocument &doc, QDomElement &parentElem ) const;
 
     virtual QList< QPair< QString, QColor > > legendSymbologyItems() const;

python/PyQt6/core/auto_generated/raster/qgsrastercontourrenderer.sip.in

@@ -50,16 +50,10 @@ Creates an instance of the renderer based on definition from XML (used by render
 
     virtual QList<QgsLayerTreeModelLegendNode *> createLegendNodes( QgsLayerTreeLayer *nodeLayer ) /Factory/;
 
+    virtual int inputBand() const;
 
+    virtual bool setInputBand( int band );
 
-    int inputBand() const;
-%Docstring
-Returns the number of the input raster band
-%End
-    void setInputBand( int band );
-%Docstring
-Sets the number of the input raster band
-%End
 
     double contourInterval() const;
 %Docstring