Merge branch 'qgis:master' into snyk-fix-fba207964f9a200e32c7914b6c62…

…7671

.gitignore

@@ -47,6 +47,21 @@ desktop.ini
 doc/INSTALL.tex
 i18n/*.qm
 ms-windows/*.exe*
+ms-windows/Installer-Files/postinstall.bat
+ms-windows/Installer-Files/preremove.bat
+ms-windows/nsis/
+ms-windows/osgeo4w/addons/
+ms-windows/osgeo4w/binary-*
+ms-windows/osgeo4w/build-*
+ms-windows/osgeo4w/nsis/
+ms-windows/osgeo4w/packages-x86/
+ms-windows/osgeo4w/packages-x86_64/
+ms-windows/osgeo4w/unpacked/
+ms-windows/osgeo4w/untgz/
+ms-windows/packages/
+ms-windows/progs/
+ms-windows/untgz/
+python/expressions/
 python/plugins/grassprovider/description/algorithms.json
 python/plugins/grassprovider/tests/testdata/directions.tif.aux.xml
 python/plugins/processing/tests/testdata/*.aux.xml
@@ -91,6 +106,8 @@ tests/testdata/raster/band3_float32_noct_epsg4326.tif.aux.xml
 tests/testdata/raster/band3_int16_noct_epsg4326.tif.aux.xml
 tests/testdata/tenbytenraster.asc.aux.xml
 tests/testdata/test_plugin_path/plugin_started.txt
+tests/testdata/test_qgis_config_path/profiles/default/*
+!tests/testdata/test_qgis_config_path/profiles/default/python
 tests/testdata/widget_config.qlr
 tests/testdata/zip/testtar.tgz.properties
 venv

CMakeLists.txt

@@ -368,10 +368,11 @@ if(WITH_CORE)
   set (WITH_INTERNAL_NLOHMANN_JSON ON CACHE BOOL "Determines whether the vendored copy of nlohmann-json should be used")
   find_package(nlohmann_json REQUIRED)
 
-  find_package(Sqlite3)
-  if (NOT SQLITE3_FOUND)
-    message (SEND_ERROR "sqlite3 dependency was not found!")
-  endif()
+  # The following bypasses the FindSQLite3 module introduced in CMake 3.14
+  # On case insensitive platforms (e.g. Windows) this is because
+  # ./cmake/FindSqlite3.cmake comes first on the CMAKE_MODULE_PATH
+  # (otherwise it is because of the case: *Sqlite3* vs. *SQLite3*)
+  find_package(Sqlite3 REQUIRED)
 
   find_package(Protobuf CONFIG)
   find_package(Protobuf REQUIRED)
@@ -1049,7 +1050,7 @@ set(QGIS_INSTALL_SYS_LIBS TRUE CACHE BOOL "If set to TRUE install all required s
 #############################################################
 # Python
 
-set(MIN_PYTHON_VERSION "3.7")
+set(MIN_PYTHON_VERSION "3.9")
 set(Python_FIND_FRAMEWORK "LAST")
 
 
@@ -1101,7 +1102,7 @@ if (WITH_CORE AND WITH_BINDINGS)
   include(SIPMacros)
 
   set(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
-  set(SIP_CONCAT_PARTS 22)
+  set(SIP_CONCAT_PARTS 25)
 
   if (NOT BINDINGS_GLOBAL_INSTALL)
     set(Python_SITEARCH ${QGIS_DATA_DIR}/python)

cmake/FindSqlite3.cmake

@@ -11,13 +11,15 @@
 #    SQLITE3_INCLUDE_DIR
 #    SQLITE3_LIBRARY
 
-
-# FIND_PATH and FIND_LIBRARY normally search standard locations
-# before the specified paths. To search non-standard paths first,
-# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
-# and then again with no specified paths to search the default
-# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
-# searching for the same item do nothing. 
+# We ensure consistency between the target defined by this file
+# and the official CMake's FindSQLite3.cmake
+# https://cmake.org/cmake/help/latest/module/FindSQLite3.html
+if(SQLITE3_FOUND)
+  if(NOT SQLite3_FOUND OR NOT TARGET SQLite::SQLite3)
+      message(FATAL_ERROR "Unconsistency between SQLite3 dependencies")
+  endif()
+  return()
+endif()
 
 # try to use framework on mac
 # want clean framework path, not unix compatibility path
@@ -37,12 +39,6 @@ IF (APPLE AND NOT QGIS_MAC_DEPS_DIR)
   ENDIF ()
 ENDIF (APPLE AND NOT QGIS_MAC_DEPS_DIR)
 
-# FIND_PATH and FIND_LIBRARY normally search standard locations
-# before the specified paths. To search non-standard paths first,
-# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
-# and then again with no specified paths to search the default
-# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
-# searching for the same item do nothing.
 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
   "$ENV{LIB_DIR}/include"
   "$ENV{LIB_DIR}/include/sqlite"
@@ -74,3 +70,18 @@ ELSE (SQLITE3_FOUND)
    ENDIF (SQLITE3_FIND_REQUIRED)
 
 ENDIF (SQLITE3_FOUND)
+
+# Create the imported target following the official CMake's FindSQLite3.cmake
+if(SQLITE3_FOUND)
+    set(SQLite3_FOUND TRUE)
+    set(SQLite3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
+    set(SQLite3_LIBRARIES ${SQLITE3_LIBRARY})
+    if(NOT TARGET SQLite::SQLite3)
+        add_library(SQLite::SQLite3 UNKNOWN IMPORTED)
+        set_target_properties(SQLite::SQLite3 PROPERTIES
+            IMPORTED_LOCATION             "${SQLITE3_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${SQLITE3_INCLUDE_DIR}")
+    else()
+        message(FATAL_ERROR "SQLite::SQLite3 target should not have been defined at this point.")
+    endif()
+endif()

doc/CMakeLists.txt

@@ -69,6 +69,7 @@ if(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/core/geometry
       ${CMAKE_SOURCE_DIR}/src/core/gps
       ${CMAKE_SOURCE_DIR}/src/core/labeling
+      ${CMAKE_SOURCE_DIR}/src/core/labeling/rules
       ${CMAKE_SOURCE_DIR}/src/core/layertree
       ${CMAKE_SOURCE_DIR}/src/core/layout
       ${CMAKE_SOURCE_DIR}/src/core/locator

external/astyle/astyle_main.cpp

@@ -1363,7 +1363,7 @@ void ASConsole::getFileNames(const string& directory, const vector<string>& wild
 
 	// sort the current entries for fileName
 	if (firstEntry < fileName.size())
-		sort(&fileName[firstEntry], &fileName[fileName.size()]);
+		sort(fileName.begin() + firstEntry, fileName.end());
 
 	// recurse into sub directories
 	// if not doing recursive, subDirectory is empty

external/qspatialite/CMakeLists.txt

@@ -5,10 +5,7 @@ add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 
-include_directories(SYSTEM
-	${SQLITE3_INCLUDE_DIR}
-	${${QT_VERSION_BASE}Sql_PRIVATE_INCLUDE_DIRS}
-)
+include_directories(SYSTEM ${${QT_VERSION_BASE}Sql_PRIVATE_INCLUDE_DIRS})
 
 set(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp qsql_spatialite.h smain.h)
 

images/images.qrc

@@ -1007,6 +1007,7 @@
         <file>themes/default/mActionReplace.svg</file>
         <file>themes/default/mIconCloud.svg</file>
         <file>themes/default/mActionTextInsideRect.svg</file>
+        <file>themes/default/mIconLabelingRules.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

python/3d/auto_additions/qgs3d.py

@@ -1,4 +1,7 @@
 # The following has been generated automatically from src/3d/qgs3d.h
-Qgs3D.instance = staticmethod(Qgs3D.instance)
-Qgs3D.initialize = staticmethod(Qgs3D.initialize)
-Qgs3D.materialRegistry = staticmethod(Qgs3D.materialRegistry)
+try:
+    Qgs3D.instance = staticmethod(Qgs3D.instance)
+    Qgs3D.initialize = staticmethod(Qgs3D.initialize)
+    Qgs3D.materialRegistry = staticmethod(Qgs3D.materialRegistry)
+except NameError:
+    pass

python/3d/auto_additions/qgs3dmapscene.py

@@ -1,6 +1,7 @@
 # The following has been generated automatically from src/3d/qgs3dmapscene.h
 try:
     Qgs3DMapScene.__attribute_docs__ = {'terrainEntityChanged': 'Emitted when the current terrain entity is replaced by a new one\n', 'terrainPendingJobsCountChanged': "Emitted when the number of terrain's pending jobs changes\n", 'totalPendingJobsCountChanged': 'Emitted when the total number of pending jobs changes\n\n.. versionadded:: 3.12\n', 'sceneStateChanged': "Emitted when the scene's state has changed\n", 'fpsCountChanged': 'Emitted when the FPS count changes\n', 'fpsCounterEnabledChanged': 'Emitted when the FPS counter is activated or deactivated\n', 'viewed2DExtentFrom3DChanged': 'Emitted when the viewed 2D extent seen by the 3D camera has changed\n\n.. versionadded:: 3.26\n', 'gpuMemoryLimitReached': "Emitted when one of the entities reaches its GPU memory limit\nand it is not possible to lower the GPU memory use by unloading\ndata that's not currently needed.\n"}
+    Qgs3DMapScene.openScenes = staticmethod(Qgs3DMapScene.openScenes)
+    Qgs3DMapScene.__signal_arguments__ = {'fpsCountChanged': ['fpsCount: float'], 'fpsCounterEnabledChanged': ['fpsCounterEnabled: bool'], 'viewed2DExtentFrom3DChanged': ['extent: List[QgsPointXY]']}
 except NameError:
     pass
-Qgs3DMapScene.openScenes = staticmethod(Qgs3DMapScene.openScenes)

python/3d/auto_additions/qgs3dmapsettings.py

@@ -1,5 +1,6 @@
 # The following has been generated automatically from src/3d/qgs3dmapsettings.h
 try:
     Qgs3DMapSettings.__attribute_docs__ = {'settingsChanged': 'Emitted when one of the configuration settings has changed\n\n.. versionadded:: 3.24\n', 'backgroundColorChanged': 'Emitted when the background color has changed\n', 'selectionColorChanged': 'Emitted when the selection color has changed\n', 'layersChanged': 'Emitted when the list of map layers for 3d rendering has changed.\n\n.. seealso:: :py:func:`setLayers`\n\n.. seealso:: :py:func:`layers`\n', 'terrainGeneratorChanged': 'Emitted when the terrain generator has changed\n', 'terrainVerticalScaleChanged': 'Emitted when the vertical scale of the terrain has changed\n', 'mapTileResolutionChanged': 'Emitted when the map tile resoulution has changed\n', 'maxTerrainScreenErrorChanged': 'Emitted when the maximum terrain screen error has changed\n', 'maxTerrainGroundErrorChanged': 'Emitted when the maximum terrain ground error has changed\n', 'terrainElevationOffsetChanged': 'Emitted when the terrain elevation offset is changed\n\n.. versionadded:: 3.16\n', 'terrainShadingChanged': 'Emitted when terrain shading enabled flag or terrain shading material has changed\n\n.. versionadded:: 3.6\n', 'terrainMapThemeChanged': "Emitted when terrain's map theme has changed\n\n.. versionadded:: 3.6\n", 'renderersChanged': "Emitted when the list of map's extra renderers have been modified\n\n.. versionadded:: 3.10\n", 'showTerrainBoundingBoxesChanged': "Emitted when the flag whether terrain's bounding boxes are shown has changed\n", 'showTerrainTilesInfoChanged': "Emitted when the flag whether terrain's tile info is shown has changed\n", 'showCameraViewCenterChanged': "Emitted when the flag whether camera's view center is shown has changed\n\n.. versionadded:: 3.4\n", 'showCameraRotationCenterChanged': "Emitted when the flag whether camera's rotation center is shown has changed\n\n.. versionadded:: 3.24\n", 'showLightSourceOriginsChanged': 'Emitted when the flag whether light source origins are shown has changed.\n\n.. versionadded:: 3.15\n', 'showLabelsChanged': 'Emitted when the flag whether labels are displayed on terrain tiles has changed\n', 'eyeDomeLightingEnabledChanged': 'Emitted when the flag whether eye dome lighting is used has changed\n\n.. versionadded:: 3.18\n', 'eyeDomeLightingStrengthChanged': 'Emitted when the eye dome lighting strength has changed\n\n.. versionadded:: 3.18\n', 'eyeDomeLightingDistanceChanged': 'Emitted when the eye dome lighting distance has changed\n\n.. versionadded:: 3.18\n', 'debugShadowMapSettingsChanged': 'Emitted when shadow map debugging has changed\n\n.. versionadded:: 3.18\n', 'debugDepthMapSettingsChanged': 'Emitted when depth map debugging has changed\n\n.. versionadded:: 3.18\n', 'pointLightsChanged': 'Emitted when the list of point lights changes\n\n.. versionadded:: 3.6\n', 'lightSourcesChanged': 'Emitted when any of the light source settings in the map changes.\n\n.. versionadded:: 3.26\n', 'directionalLightsChanged': 'Emitted when the list of directional lights changes\n\n.. versionadded:: 3.16\n', 'fieldOfViewChanged': 'Emitted when the camera lens field of view changes\n\n.. versionadded:: 3.8\n', 'projectionTypeChanged': 'Emitted when the camera lens projection type changes\n\n.. versionadded:: 3.18\n', 'cameraNavigationModeChanged': 'Emitted when the camera navigation mode was changed\n\n.. versionadded:: 3.18\n', 'cameraMovementSpeedChanged': 'Emitted when the camera movement speed was changed\n\n.. versionadded:: 3.18\n', 'skyboxSettingsChanged': 'Emitted when skybox settings are changed\n\n.. versionadded:: 3.16\n', 'shadowSettingsChanged': 'Emitted when shadow rendering settings are changed\n\n.. versionadded:: 3.16\n', 'ambientOcclusionSettingsChanged': 'Emitted when ambient occlusion rendering settings are changed\n\n.. versionadded:: 3.28\n', 'fpsCounterEnabledChanged': 'Emitted when the FPS counter is enabled or disabled\n\n.. versionadded:: 3.18\n', 'viewFrustumVisualizationEnabledChanged': "Emitted when the camera's view frustum visualization on the main 2D map canvas is enabled or disabled\n\n.. versionadded:: 3.26\n", 'axisSettingsChanged': 'Emitted when 3d axis rendering settings are changed\n\n.. versionadded:: 3.26\n', 'debugOverlayEnabledChanged': 'Emitted when the debug overaly is enabled or disabled\n\n.. versionadded:: 3.26\n', 'extentChanged': "Emitted when the 3d view's 2d extent has changed\n\n.. seealso:: :py:func:`setExtent`\n\n.. versionadded:: 3.30\n", 'showExtentIn2DViewChanged': "Emitted when the parameter to display 3d view's extent in the 2D canvas has changed\n\n.. seealso:: :py:func:`setShowExtentIn2DView`\n\n.. versionadded:: 3.32\n"}
+    Qgs3DMapSettings.__signal_arguments__ = {'terrainElevationOffsetChanged': ['newElevation: float'], 'fpsCounterEnabledChanged': ['fpsCounterEnabled: bool'], 'debugOverlayEnabledChanged': ['debugOverlayEnabled: bool']}
 except NameError:
     pass

python/3d/auto_additions/qgscameracontroller.py

@@ -1,5 +1,6 @@
 # The following has been generated automatically from src/3d/qgscameracontroller.h
 try:
     QgsCameraController.__attribute_docs__ = {'cameraChanged': 'Emitted when camera has been updated\n', 'navigationModeChanged': 'Emitted when the navigation mode is changed using the hotkey ctrl + ~\n', 'cameraMovementSpeedChanged': 'Emitted whenever the camera movement speed is changed by the controller.\n', 'setCursorPosition': 'Emitted when the mouse cursor position should be moved to the specified ``point``\non the map viewport.\n', 'requestDepthBufferCapture': 'Emitted to ask for the depth buffer image\n\n.. versionadded:: 3.24\n', 'cameraRotationCenterChanged': 'Emitted when the camera rotation center changes\n\n.. versionadded:: 3.24\n'}
+    QgsCameraController.__signal_arguments__ = {'navigationModeChanged': ['mode: Qgis.NavigationMode'], 'cameraMovementSpeedChanged': ['speed: float'], 'setCursorPosition': ['point: QPoint'], 'cameraRotationCenterChanged': ['position: QVector3D']}
 except NameError:
     pass

python/3d/auto_additions/qgsgoochmaterialsettings.py

@@ -1,7 +1,7 @@
 # The following has been generated automatically from src/3d/materials/qgsgoochmaterialsettings.h
-QgsGoochMaterialSettings.create = staticmethod(QgsGoochMaterialSettings.create)
-QgsGoochMaterialSettings.supportsTechnique = staticmethod(QgsGoochMaterialSettings.supportsTechnique)
 try:
+    QgsGoochMaterialSettings.create = staticmethod(QgsGoochMaterialSettings.create)
+    QgsGoochMaterialSettings.supportsTechnique = staticmethod(QgsGoochMaterialSettings.supportsTechnique)
     QgsGoochMaterialSettings.__group__ = ['materials']
 except NameError:
     pass

python/3d/auto_additions/qgslayoutitem3dmap.py

@@ -1,2 +1,5 @@
 # The following has been generated automatically from src/3d/qgslayoutitem3dmap.h
-QgsLayoutItem3DMap.create = staticmethod(QgsLayoutItem3DMap.create)
+try:
+    QgsLayoutItem3DMap.create = staticmethod(QgsLayoutItem3DMap.create)
+except NameError:
+    pass

python/3d/auto_additions/qgslightsource.py

@@ -1,6 +1,6 @@
 # The following has been generated automatically from src/3d/lights/qgslightsource.h
-QgsLightSource.createFromXml = staticmethod(QgsLightSource.createFromXml)
 try:
+    QgsLightSource.createFromXml = staticmethod(QgsLightSource.createFromXml)
     QgsLightSource.__group__ = ['lights']
 except NameError:
     pass

python/3d/auto_additions/qgsline3dsymbol.py

@@ -1,6 +1,6 @@
 # The following has been generated automatically from src/3d/symbols/qgsline3dsymbol.h
-QgsLine3DSymbol.create = staticmethod(QgsLine3DSymbol.create)
 try:
+    QgsLine3DSymbol.create = staticmethod(QgsLine3DSymbol.create)
     QgsLine3DSymbol.__group__ = ['symbols']
 except NameError:
     pass

python/3d/auto_additions/qgsmetalroughmaterialsettings.py

@@ -1,7 +1,7 @@
 # The following has been generated automatically from src/3d/materials/qgsmetalroughmaterialsettings.h
-QgsMetalRoughMaterialSettings.supportsTechnique = staticmethod(QgsMetalRoughMaterialSettings.supportsTechnique)
-QgsMetalRoughMaterialSettings.create = staticmethod(QgsMetalRoughMaterialSettings.create)
 try:
+    QgsMetalRoughMaterialSettings.supportsTechnique = staticmethod(QgsMetalRoughMaterialSettings.supportsTechnique)
+    QgsMetalRoughMaterialSettings.create = staticmethod(QgsMetalRoughMaterialSettings.create)
     QgsMetalRoughMaterialSettings.__group__ = ['materials']
 except NameError:
     pass

python/3d/auto_additions/qgsnullmaterialsettings.py

@@ -1,7 +1,7 @@
 # The following has been generated automatically from src/3d/materials/qgsnullmaterialsettings.h
-QgsNullMaterialSettings.supportsTechnique = staticmethod(QgsNullMaterialSettings.supportsTechnique)
-QgsNullMaterialSettings.create = staticmethod(QgsNullMaterialSettings.create)
 try:
+    QgsNullMaterialSettings.supportsTechnique = staticmethod(QgsNullMaterialSettings.supportsTechnique)
+    QgsNullMaterialSettings.create = staticmethod(QgsNullMaterialSettings.create)
     QgsNullMaterialSettings.__group__ = ['materials']
 except NameError:
     pass

python/3d/auto_additions/qgsphongmaterialsettings.py

@@ -1,7 +1,7 @@
 # The following has been generated automatically from src/3d/materials/qgsphongmaterialsettings.h
-QgsPhongMaterialSettings.supportsTechnique = staticmethod(QgsPhongMaterialSettings.supportsTechnique)
-QgsPhongMaterialSettings.create = staticmethod(QgsPhongMaterialSettings.create)
 try:
+    QgsPhongMaterialSettings.supportsTechnique = staticmethod(QgsPhongMaterialSettings.supportsTechnique)
+    QgsPhongMaterialSettings.create = staticmethod(QgsPhongMaterialSettings.create)
     QgsPhongMaterialSettings.__group__ = ['materials']
 except NameError:
     pass