Merge branch 'qgis:master' into master

Author: ismogis

.ci/ogc/build.sh

@@ -37,6 +37,7 @@ cmake -GNinja \
  -DWITH_SERVER_PLUGINS=ON \
  -DWITH_ORACLE=OFF \
  -DWITH_PDAL=OFF \
+ -DWITH_QTPRINTER=OFF \
  -DDISABLE_DEPRECATED=ON \
  -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
  -DCMAKE_C_COMPILER=/bin/clang \

.ci/run_tests.sh

@@ -2,15 +2,11 @@
 
 set -e
 
-# check for docker-compose and docker availability
+# check for docker availability
 command -v docker > /dev/null || {
 	echo "Please install docker" >&2
 	exit 1
 }
-command -v docker-compose > /dev/null || {
-	echo "Please install docker-compose" >&2
-	exit 1
-}
 
 IMAGE_BUILD_DEPS=qgis/qgis3-build-deps:latest
 UPDATE_IMAGES=yes
@@ -115,7 +111,7 @@ if test "$(docker images -q qgis3-build-deps-binary-image)" = ""; then
 fi
 
 if test "${INTERACTIVE}" = "no"; then
-  echo "--=[ Running tests via docker-compose"
+  echo "--=[ Running tests via docker compose"
   COMMAND=${QGIS_WORKSPACE_MOUNTPOINT}/.docker/docker-qgis-test.sh
   COMMAND_ARGS="${TESTS_TO_RUN}"
 else
@@ -129,7 +125,7 @@ mkdir -p /tmp/minio_tests/test-bucket && chmod -R 777 /tmp/minio_tests
 # Create an empty webdav folder with appropriate permissions so www user can write inside it
 mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests
 
-docker-compose \
+docker compose \
   -f .docker/docker-compose-testing.yml \
   run \
   -w "${QGIS_WORKSPACE_MOUNTPOINT}" \

.ci/test_blocklist_qt5.txt

@@ -1,5 +1,4 @@
 # black list
-PyQgsPalLabelingServer
 qgis_composerutils
 PyQgsAppStartup
 test_gui_queryresultwidget

.ci/test_blocklist_qt6.txt

@@ -1,22 +1,19 @@
 # Qt6 blocklist
-test_core_authconfig
 test_core_compositionconverter
-test_core_dxfexport
 test_core_expression
 test_core_labelingengine
 test_core_layoutpicture
+# test_core_ogcutils runs fine locally on Fedora:rawhide but not on CI
 test_core_ogcutils
 test_core_vectortilelayer
 test_gui_processinggui
-test_gui_querybuilder
 test_app_advanceddigitizing
 test_app_vertextool
 
 # Crashes -- also disabled on qt5 builds!
 test_gui_queryresultwidget
 
 # block list
-PyQgsPalLabelingServer
 qgis_composerutils
 PyQgsAppStartup
 
@@ -41,257 +38,45 @@ PyQgsProviderConnectionMssql
 PyQgsStyleStorageMssql
 
 # To be fixed
-PyQgsAFSProvider
-PyQgsAggregateMappingWidget
-PyQgsAnimatedMarkerSymbolLayer
-PyQgsArcGisRestUtils
 PyQgsPythonProvider
-PyQgsAggregateCalculator
 PyQgsAnnotation
-PyQgsAnnotationLayer
-PyQgsAnnotationLineItem
-PyQgsAnnotationMarkerItem
-PyQgsAnnotationPolygonItem
-PyQgsAttributeForm
-PyQgsAttributeTableModel
 PyQgsAuthenticationSystem
-PyQgsBatchGeocodeAlgorithm
 PyQgsBlockingProcess
-PyQgsBookmarkModel
-PyQgsCategorizedSymbolRenderer
 PyQgsCodeEditor
-PyQgsColorRamp
-PyQgsColorRampLegendNode
-PyQgsCombinedStyleModel
-PyQgsConditionalStyle
-PyQgsConnectionRegistry
-PyQgsXmlUtils
-PyQgsDateTimeStatisticalSummary
 PyQgsDelimitedTextProvider
 PyQgsEditWidgets
 PyQgsElevationProfileCanvas
-PyQgsEmbeddedSymbolRenderer
-PyQgsExifTools
-PyQgsExpression
-PyQgsFeature
-PyQgsFeatureSink
-PyQgsFieldComboBoxTest
-PyQgsFieldFormattersTest
 PyQgsProject
-PyQgsProjectBadLayers
-PyQgsProjectStyleSettings
-PyQgsFeatureIterator
-PyQgsFeatureRequest
-PyQgsFieldDomain
-PyQgsFieldDomainWidget
-PyQgsField
-PyQgsFields
-PyQgsFieldModel
-PyQgsFieldMappingWidget
 PyQgsFloatingWidget
-PyQgsGdalProvider
-PyQgsGeometryGeneratorSymbolLayer
-PyQgsGeometryTest
-PyQgsGpsLogger
-PyQgsHighlight
-PyQgsJsonUtils
-PyQgsLabelObstacleSettings
-PyQgsLabelSettingsWidget
-PyQgsLabelThinningSettings
-PyQgsLayerMetadata
-PyQgsLayerMetadataProviderPython
-PyQgsLayerMetadataProviderOgr
-PyQgsLayerMetadataResultsModel
-PyQgsLayerTreeView
-PyQgsLayoutAtlas
-PyQgsLayoutElevationProfile
-PyQgsLayoutExporter
-PyQgsLayoutManagerModel
-PyQgsLayoutPageCollection
-PyQgsLayoutView
-PyQgsLayoutGuide
 PyQgsLayoutHtml
-PyQgsLayoutItem
-PyQgsLayoutLegend
-PyQgsLayoutMap
-PyQgsLayoutMapGrid
-PyQgsLayoutMapOverview
-PyQgsLayoutMarker
-PyQgsLayoutPolygon
-PyQgsLayoutPolyline
-PyQgsLayoutShape
 PyQgsLineSymbolLayers
-PyQgsLocator
 PyQgsMapBoxGlStyleConverter
-PyQgsMapLayerModel
-PyQgsMapLayerUtils
-PyQgsMarkerLineSymbolLayer
-PyQgsMetadataBase
 PyQgsMemoryProvider
-PyQgsMeshLayerProfileGenerator
 PyQgsNetworkAccessManager
-PyQgsOgcUtils
-PyQgsOGRProviderGpkg
-PyQgsOGRProviderSqlite
-PyQgsPalLabelingBase
-PyQgsPalLabelingCanvas
-PyQgsPalLabelingLayout
 PyQgsPalLabelingPlacement
 PyQgsPlot
-PyQgsPointCloudAttributeComboBox
-PyQgsPointCloudAttributeModel
-PyQgsPointCloudClassifiedRenderer
-PyQgsPointCloudLayerProfileGenerator
-PyQgsPointCloudRgbRenderer
-PyQgsPointDisplacementRenderer
-PyQgsProcessExecutablePt1
-PyQgsProcessExecutablePt2
-PyQgsProcessingInPlace
-PyQgsProcessingAlgRunner
-PyQgsProcessingParameters
-PyQgsProcessingPackageLayersAlgorithm
-PyQgsProjectMetadata
-PyQgsProjectUtils
-PyQgsProviderConnectionModel
-PyQgsProviderConnectionGpkg
-PyQgsProviderConnectionSpatialite
-PyQgsSensorManager
-PyQgsSensorModel
-PyQgsStyleStorageSpatialite
-PyQgsStyleStorageGpkg
-PyQgsProviderSublayerDetails
-PyQgsProviderSublayerModel
-PyQgsRangeWidgets
 PyQgsRasterAttributeTable
-PyQgsRasterAttributeTableModel
-PyQgsRasterFileWriter
-PyQgsRasterLayer
-PyQgsRasterLayerProfileGenerator
 PyQgsRasterLayerRenderer
-PyQgsRasterPipe
-PyQgsProviderUtils
-PyQgsRenderContext
-PyQgsSingleSymbolRenderer
 PyQgsShapefileProvider
-PyQgsSvgCache
-PyQgsTabfileProvider
 PyQgsTextRenderer
-PyQgsOGRProvider
-PyQgsSimpleLineSymbolLayer
 PyQgsSpatialiteProvider
-PyQgsSymbolLayer
-PyQgsRasterRendererCreateSld
-PyQgsSymbolLayerCreateSld
 PyQgsSymbolLayerReadSld
-PyQgsArrowSymbolLayer
-PyQgsSymbolExpressionVariables
-PyQgsStringUtils
-PyQgsStyleModel
-PyQgsSubsetStringEditorProviderRegistry
-PyQgsTemporalUtils
-PyQgsTextDocument
-PyQgsTextFormatWidget
-PyQgsValidityChecks
-PyQgsValidityResultsWidget
-PyQgsVectorFieldMarkerSymbolLayer
-PyQgsVectorFileWriter
-PyQgsVectorLayer
-PyQgsVectorLayerElevationProperties
 PyQgsVectorLayerCache
 PyQgsVectorLayerEditBuffer
 PyQgsVectorLayerEditUtils
-PyQgsVectorLayerProfileGenerator
-PyQgsVectorLayerSelectedFeatureSource
-PyQgsVectorLayerShapefile
-PyQgsVectorLayerTemporalProperties
-PyQgsVectorLayerUtils
-PyQgsZonalStatistics
-PyQgsVirtualLayerProvider
-PyQgsVirtualLayerDefinition
 PyQgsLayerDefinition
-PyQgsWFSProvider
-PyQgsOapifProvider
-PyQgsDBManagerGpkg
-PyQgsDBManagerSpatialite
-PyQgsFileDownloader
 PyQgsSettings
 PyQgsSettingsEntry
-PyQgsSettingsTreeNode
-PyQgsAuxiliaryStorage
-PyQgsFieldValidator
-PyQgsDBManagerSQLWindow
 PyQgsSelectiveMasking
-PyQgsRasterAttributeTableWidget
 PyQgsServerApi
 PyQgsServerWMSGetFeatureInfo
 PyQgsServerWMSGetMap
-PyQgsServerWMSGetLegendGraphic
-PyQgsServerWMSGetPrint
-PyQgsServerWMSGetPrintExtra
-PyQgsServerWMSGetPrintOutputs
-PyQgsServerWMSGetPrintAtlas
-PyQgsServerWMSDimension
-PyQgsServerSettings
-PyQgsServerAccessControlWMSGetlegendgraphic
 PyQgsServerAccessControlWFSTransactional
-PyQgsServerCacheManager
 PyQgsServerWFS
-PyQgsServerWFST
-PyQgsAuthManagerPasswordOWSTest
-PyQgsServerServices
-PyQgsArcGisPortalUtils
-PyQgsBinaryWidget
-PyQgsClassificationMethod
-PyQgsGeocoderLocatorFilter
-PyQgsNominatimGeocoder
-PyQgsGoogleMapsGeocoder
-PyQgsGpxProvider
-PyQgsHistoryProviderRegistry
-PyQgsLegendPatchShape
-PyQgsMapCanvas
-PyQgsMapCanvasAnnotationItem
-PyQgsMergedFeatureRenderer
-PyQgsMeshLayerElevationProperties
-PyQgsNumericFormat
-PyQgsPointCloudDataProvider
-PyQgsPointCloudExtentRenderer
-PyQgsPointClusterRenderer
-PyQgsTableCell
-PyQgsSearchWidgetWrapper
-PyQgsSimpleFillSymbolLayer
-PyQgsSymbol
-PyQgsTiles
-PyQgsRelationEditorWidgetRegistry
-PyQgsVectorTile
-PyQgsVtpk
-ProcessingGeneralTest
-ProcessingGuiTest
-ProcessingModelerTest
-ProcessingProjectProviderTest
-ProcessingParametersTest
-ProcessingGenericAlgorithmsTest
-ProcessingQgisAlgorithmsTestPt1
 ProcessingQgisAlgorithmsTestPt2
 ProcessingQgisAlgorithmsTestPt3
 ProcessingQgisAlgorithmsTestPt4
-ProcessingQgisAlgorithmsTestPt5
-ProcessingGdalAlgorithmsGeneralTest
-ProcessingGdalAlgorithmsRasterTest
 ProcessingGdalAlgorithmsVectorTest
-ProcessingCheckValidityAlgorithmTest
-ProcessingGrass7AlgorithmsImageryTest
-ProcessingGrass7AlgorithmsRasterTestPt1
-ProcessingGrass7AlgorithmsRasterTestPt2
-ProcessingGrass7AlgorithmsVectorTest
-ProcessingOtbAlgorithmsTest
-PyPythonRepr
-TestQgsRandomMarkerSymbolLayer
-ProcessingToolsTest
-PyQgsCesium3dTilesLayer
-PyQgsCoordinateReferenceSystemModel
+ProcessingGrassAlgorithmsImageryTest
+# PyQgsProviderRegistry runs fine locally on Fedora:rawhide but not on CI
 PyQgsProviderRegistry
-PyQgsTiledSceneLayer
-PyQgsTiledSceneTile
-ProcessingScriptUtilsTest
-PyQgsColorScheme
-PyQgsSearchWidgetToolButton

.docker/docker-qgis-build.sh

@@ -35,16 +35,11 @@ pushd ${CTEST_BUILD_DIR} > /dev/null
 echo "${bold}Running cmake...${endbold}"
 echo "::group::cmake"
 
-if [[ -f "/usr/lib64/ccache/clang" ]]; then
-  export CC=/usr/lib64/ccache/clang
-  export CXX=/usr/lib64/ccache/clang++
-else
-  export CC=/usr/lib/ccache/clang
-  export CXX=/usr/lib/ccache/clang++
-fi
-
 BUILD_TYPE=Release
 
+export CC=/usr/bin/clang
+export CXX=/usr/bin/clang++
+
 if [[ "${WITH_CLAZY}" = "ON" ]]; then
   # In release mode, all variables in QgsDebugMsg would be considered unused
   BUILD_TYPE=Debug
@@ -75,7 +70,7 @@ fi
 cmake \
  -GNinja \
  -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
- -DUSE_CCACHE=OFF \
+ -DUSE_CCACHE=ON \
  -DBUILD_WITH_QT6=${BUILD_WITH_QT6} \
  -DWITH_DESKTOP=ON \
  -DWITH_ANALYSIS=ON \
@@ -110,6 +105,7 @@ cmake \
  -DWITH_QTWEBKIT=${WITH_QT5} \
  -DWITH_QTWEBENGINE=${WITH_QTWEBENGINE} \
  -DWITH_OAUTH2_PLUGIN=${WITH_QT5} \
+ -DWITH_PDF4QT=${WITH_PDF4QT} \
  -DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \
  -DORACLE_LIBDIR=/instantclient_19_9/ \
  -DDISABLE_DEPRECATED=ON \

.docker/docker-qgis-test.sh

@@ -278,6 +278,8 @@ echo "::group::Print disk space before running tests"
 df -h
 echo "::endgroup::"
 
+export QTWEBENGINE_DISABLE_SANDBOX=1
+
 python3 ${SRCDIR}/.ci/ctest2ci.py xvfb-run ctest -V $CTEST_OPTIONS -E "${EXCLUDE_TESTS}" -S ${SRCDIR}/.ci/config_test.ctest --output-on-failure
 
 echo "::group::Print disk space after running tests"

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

@@ -73,6 +73,7 @@ RUN  apt-get update \
     python3-pyqt5.qtwebkit \
     python3-pyqt5.qtpositioning \
     python3-pyqt5.qtmultimedia \
+    python3-pyqt5.qtserialport \
     python3-sip \
     python3-termcolor \
     python3-yaml \
@@ -151,7 +152,7 @@ RUN  apt-get update \
 
 # HANA: client side
 # Install hdbsql tool
-RUN curl -j -k -L -H "Cookie: eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
+RUN curl -j -k -L -H "Cookie: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
   && tar -xvf hanaclient-latest-linux-x64.tar.gz \
   && mkdir /usr/sap \
   && ./client/hdbinst -a client --sapmnt=/usr/sap \