Merge branch 'qgis:master' into master

Author: JuhoErvasti

.ci/test_blocklist_qt6.txt

@@ -50,39 +50,29 @@ PyQgsAggregateCalculator
 PyQgsAnnotation
 PyQgsAnnotationLayer
 PyQgsAnnotationLineItem
-PyQgsAnnotationLineTextItem
 PyQgsAnnotationMarkerItem
-PyQgsAnnotationPointTextItem
 PyQgsAnnotationPolygonItem
 PyQgsAttributeForm
 PyQgsAttributeTableModel
 PyQgsAuthenticationSystem
 PyQgsBatchGeocodeAlgorithm
-PyQgsBlendModes
 PyQgsBlockingProcess
-PyQgsBlockingNetworkRequest
-PyQgsBookmarkManager
 PyQgsBookmarkModel
 PyQgsCategorizedSymbolRenderer
-PyQgsCodeEditorPython
 PyQgsCodeEditor
 PyQgsColorRamp
 PyQgsColorRampLegendNode
-PyQgsColorUtils
 PyQgsCombinedStyleModel
-PyQgsCoordinateFormatter
 PyQgsConditionalStyle
 PyQgsConnectionRegistry
 PyQgsXmlUtils
-PyQgsDateTimeEdit
 PyQgsDateTimeStatisticalSummary
 PyQgsDelimitedTextProvider
 PyQgsEditWidgets
 PyQgsElevationProfileCanvas
 PyQgsEmbeddedSymbolRenderer
 PyQgsExifTools
 PyQgsExpression
-PyQgsExpressionBuilderWidget
 PyQgsFeature
 PyQgsFeatureSink
 PyQgsFieldComboBoxTest
@@ -103,9 +93,6 @@ PyQgsGdalProvider
 PyQgsGeometryGeneratorSymbolLayer
 PyQgsGeometryTest
 PyQgsGpsLogger
-PyQgsGraduatedSymbolRenderer
-PyQgsGroupLayer
-PyQgsHashLineSymbolLayer
 PyQgsHighlight
 PyQgsJsonUtils
 PyQgsLabelObstacleSettings
@@ -115,49 +102,34 @@ PyQgsLayerMetadata
 PyQgsLayerMetadataProviderPython
 PyQgsLayerMetadataProviderOgr
 PyQgsLayerMetadataResultsModel
-PyQgsLayerTree
 PyQgsLayerTreeView
 PyQgsLayoutAtlas
 PyQgsLayoutElevationProfile
 PyQgsLayoutExporter
-PyQgsLayoutFrame
 PyQgsLayoutManagerModel
 PyQgsLayoutPageCollection
 PyQgsLayoutView
 PyQgsLayoutGuide
 PyQgsLayoutHtml
 PyQgsLayoutItem
-PyQgsLayoutItemComboBox
-PyQgsLayoutLabel
 PyQgsLayoutLegend
 PyQgsLayoutMap
-PyQgsLayoutItemMapItemClipPathSettings
 PyQgsLayoutMapGrid
 PyQgsLayoutMapOverview
 PyQgsLayoutMarker
-PyQgsLayoutPage
-PyQgsLayoutPicture
 PyQgsLayoutPolygon
 PyQgsLayoutPolyline
-PyQgsLayoutScaleBar
 PyQgsLayoutShape
 PyQgsLineSymbolLayers
-PyQgsLineburstSymbolLayer
 PyQgsLocator
 PyQgsMapBoxGlStyleConverter
-PyQgsMapLayer
-PyQgsMapLayerComboBox
 PyQgsMapLayerModel
 PyQgsMapLayerUtils
-PyQgsMapRenderer
 PyQgsMarkerLineSymbolLayer
 PyQgsMetadataBase
 PyQgsMemoryProvider
 PyQgsMeshLayerProfileGenerator
 PyQgsNetworkAccessManager
-PyQgsNullSymbolRenderer
-PyQgsNewGeoPackageLayerDialog
-PyQgsNewVectorTableDialog
 PyQgsOgcUtils
 PyQgsOGRProviderGpkg
 PyQgsOGRProviderSqlite
@@ -189,29 +161,23 @@ PyQgsStyleStorageSpatialite
 PyQgsStyleStorageGpkg
 PyQgsProviderSublayerDetails
 PyQgsProviderSublayerModel
-PyQgsRangeSlider
 PyQgsRangeWidgets
 PyQgsRasterAttributeTable
 PyQgsRasterAttributeTableModel
 PyQgsRasterFileWriter
 PyQgsRasterLayer
 PyQgsRasterLayerProfileGenerator
 PyQgsRasterLayerRenderer
-PyQgsRasterLineSymbolLayer
 PyQgsRasterPipe
-PyQgsRasterTransparencyWidget
 PyQgsProviderUtils
 PyQgsRenderContext
-PyQgsRubberBand
 PyQgsSingleSymbolRenderer
 PyQgsShapefileProvider
 PyQgsSvgCache
 PyQgsTabfileProvider
 PyQgsTextRenderer
 PyQgsOGRProvider
-PyQgsShortcutsManager
 PyQgsSimpleLineSymbolLayer
-PyQgsSingleItemModel
 PyQgsSpatialiteProvider
 PyQgsSymbolLayer
 PyQgsRasterRendererCreateSld
@@ -222,19 +188,15 @@ PyQgsSymbolExpressionVariables
 PyQgsStringUtils
 PyQgsStyleModel
 PyQgsSubsetStringEditorProviderRegistry
-PyQgsSymbolLayerUtils
 PyQgsTemporalUtils
 PyQgsTextDocument
 PyQgsTextFormatWidget
-PyQgsTreeWidgetItem
-PyQgsUnitTypes
 PyQgsValidityChecks
 PyQgsValidityResultsWidget
 PyQgsVectorFieldMarkerSymbolLayer
 PyQgsVectorFileWriter
 PyQgsVectorLayer
 PyQgsVectorLayerElevationProperties
-PyQgsVectorLayerFeatureCounter
 PyQgsVectorLayerCache
 PyQgsVectorLayerEditBuffer
 PyQgsVectorLayerEditUtils
@@ -249,7 +211,6 @@ PyQgsVirtualLayerDefinition
 PyQgsLayerDefinition
 PyQgsWFSProvider
 PyQgsOapifProvider
-PyQgsConsole
 PyQgsDBManagerGpkg
 PyQgsDBManagerSpatialite
 PyQgsFileDownloader
@@ -261,7 +222,6 @@ PyQgsFieldValidator
 PyQgsDBManagerSQLWindow
 PyQgsSelectiveMasking
 PyQgsRasterAttributeTableWidget
-PyQgsServerWMS
 PyQgsServerApi
 PyQgsServerWMSGetFeatureInfo
 PyQgsServerWMSGetMap
@@ -277,7 +237,6 @@ PyQgsServerAccessControlWFSTransactional
 PyQgsServerCacheManager
 PyQgsServerWFS
 PyQgsServerWFST
-PyQgsServerLocaleOverride
 PyQgsAuthManagerPasswordOWSTest
 PyQgsServerServices
 PyQgsArcGisPortalUtils
@@ -325,15 +284,11 @@ ProcessingGrass7AlgorithmsRasterTestPt1
 ProcessingGrass7AlgorithmsRasterTestPt2
 ProcessingGrass7AlgorithmsVectorTest
 ProcessingOtbAlgorithmsTest
-PyCoreAdditions
 PyPythonRepr
 TestQgsRandomMarkerSymbolLayer
 ProcessingToolsTest
-test_app_qgisapppython
 PyQgsCesium3dTilesLayer
 PyQgsCoordinateReferenceSystemModel
-PyQgsFilledLineSymbolLayer
-PyQgsPainting
 PyQgsProviderRegistry
 PyQgsTiledSceneLayer
 PyQgsTiledSceneTile

.docker/qgis3-qt6-build-deps.dockerfile

@@ -37,6 +37,8 @@ RUN dnf -y --refresh install \
     protobuf-devel \
     protobuf-lite-devel \
     python3-devel \
+    python3-mock \
+    python3-OWSLib \
     python3-pyqt6 \
     python3-pyqt6-devel \
     python3-qscintilla-qt6 \

python/3d/3d_auto.sip

@@ -4,7 +4,7 @@
 %Include auto_generated/qgs3dmapscene.sip
 %Include auto_generated/qgs3dmapsettings.sip
 %Include auto_generated/qgs3dtypes.sip
-%Include auto_generated/qgs3dwindow.sip
+%Include auto_generated/qgs3dmapcanvas.sip
 %Include auto_generated/qgsabstractvectorlayer3drenderer.sip
 %Include auto_generated/qgscameracontroller.sip
 %Include auto_generated/qgscamerapose.sip

python/3d/auto_generated/qgs3dwindow.sip.in python/3d/auto_generated/qgs3dmapcanvas.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgs3dwindow.h                                                 *
+ * src/3d/qgs3dmapcanvas.h                                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -11,10 +11,12 @@
 
 
 
-class Qgs3DWindow : QWindow
+
+
+class Qgs3DMapCanvas : QWindow
 {
 %Docstring(signature="appended")
-qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
+Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
 
 .. note::
 
@@ -32,16 +34,31 @@ qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window rea
 %End
 
 %TypeHeaderCode
-#include "qgs3dwindow.h"
+#include "qgs3dmapcanvas.h"
 %End
   public:
 
-    Qgs3DWindow();
+    Qgs3DMapCanvas();
 %Docstring
-Constructor for Qgs3DWindow.
+Constructor for Qgs3DMapCanvas.
 %End
 
-    ~Qgs3DWindow();
+    ~Qgs3DMapCanvas();
+
+    Qgs3DMapSettings *mapSettings();
+%Docstring
+Returns access to the 3D scene configuration
+%End
+
+    Qgs3DMapScene *scene();
+%Docstring
+Returns access to the 3D scene (root 3D entity)
+%End
+
+    QgsCameraController *cameraController();
+%Docstring
+Returns access to the view's camera controller. Returns ``None`` if the scene has not been initialized yet with :py:func:`~Qgs3DMapCanvas.setMapSettings`
+%End
 
 
   protected:
@@ -58,12 +75,15 @@ Manages the display events specified in e.
 Resets the aspect ratio of the 3D window.
 %End
 
+    virtual bool eventFilter( QObject *watched, QEvent *event );
+
+
 };
 
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgs3dwindow.h                                                 *
+ * src/3d/qgs3dmapcanvas.h                                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

python/3d/auto_generated/qgs3dmapscene.sip.in

@@ -120,14 +120,17 @@ Returns the 3D map settings.
 .. versionadded:: 3.30
 %End
 
-    static QMap< QString, Qgs3DMapScene * > openScenes();
+ static QMap< QString, Qgs3DMapScene * > openScenes() /Deprecated/;
 %Docstring
 Returns a map of 3D map scenes (by name) open in the QGIS application.
 
 .. note::
 
    Only available from the QGIS desktop application.
 
+.. deprecated:: QGIS 3.36
+  use QgisAppInterface.mapCanvases3D() instead.
+
 .. versionadded:: 3.30
 %End
 

python/PyQt6/3d/3d_auto.sip

@@ -4,7 +4,7 @@
 %Include auto_generated/qgs3dmapscene.sip
 %Include auto_generated/qgs3dmapsettings.sip
 %Include auto_generated/qgs3dtypes.sip
-%Include auto_generated/qgs3dwindow.sip
+%Include auto_generated/qgs3dmapcanvas.sip
 %Include auto_generated/qgsabstractvectorlayer3drenderer.sip
 %Include auto_generated/qgscameracontroller.sip
 %Include auto_generated/qgscamerapose.sip

python/PyQt6/3d/auto_generated/qgs3dwindow.sip.in python/PyQt6/3d/auto_generated/qgs3dmapcanvas.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgs3dwindow.h                                                 *
+ * src/3d/qgs3dmapcanvas.h                                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -11,10 +11,12 @@
 
 
 
-class Qgs3DWindow : QWindow
+
+
+class Qgs3DMapCanvas : QWindow
 {
 %Docstring(signature="appended")
-qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
+Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
 
 .. note::
 
@@ -32,16 +34,31 @@ qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window rea
 %End
 
 %TypeHeaderCode
-#include "qgs3dwindow.h"
+#include "qgs3dmapcanvas.h"
 %End
   public:
 
-    Qgs3DWindow();
+    Qgs3DMapCanvas();
 %Docstring
-Constructor for Qgs3DWindow.
+Constructor for Qgs3DMapCanvas.
 %End
 
-    ~Qgs3DWindow();
+    ~Qgs3DMapCanvas();
+
+    Qgs3DMapSettings *mapSettings();
+%Docstring
+Returns access to the 3D scene configuration
+%End
+
+    Qgs3DMapScene *scene();
+%Docstring
+Returns access to the 3D scene (root 3D entity)
+%End
+
+    QgsCameraController *cameraController();
+%Docstring
+Returns access to the view's camera controller. Returns ``None`` if the scene has not been initialized yet with :py:func:`~Qgs3DMapCanvas.setMapSettings`
+%End
 
 
   protected:
@@ -58,12 +75,15 @@ Manages the display events specified in e.
 Resets the aspect ratio of the 3D window.
 %End
 
+    virtual bool eventFilter( QObject *watched, QEvent *event );
+
+
 };
 
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgs3dwindow.h                                                 *
+ * src/3d/qgs3dmapcanvas.h                                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/