Merge branch 'qgis:master' into master

qgis · Jun 1, 2021 · 18bbfa9 · 18bbfa9
2 parents 4b4748c + c1d7e91
commit 18bbfa9
Show file tree

Hide file tree

Showing 283 changed files with 4,605 additions and 2,430 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Cache
         id: cache
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.ccache
           key: docker-build-${{ matrix.branch }}-${{ github.sha }}

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Prepare build cache for pull request
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         if: github.event_name == 'pull_request'
         with:
           path: ${{ env.CCACHE_DIR }}
@@ -59,7 +59,7 @@ jobs:
 
       - name: Prepare build cache for branch/tag
         # use a fork of actions/cache@v2 to upload cache even when the build or test failed
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         if: github.event_name != 'pull_request'
         with:
           path: ${{ env.CCACHE_DIR }}
@@ -73,7 +73,7 @@ jobs:
       # Qt caching
       - name: Cache Qt
         id: cache-qt
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         with:
           path: ${{ env.DEPS_CACHE_DIR }}/Qt/${{ env.QT_VERSION }}
           key: mac-qt-v4-${{ env.QT_VERSION }}
@@ -96,7 +96,7 @@ jobs:
       # QGIS-deps caching
       - name: Cache qgis-deps
         id: cache-deps
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         with:
           path: ${{ env.DEPS_CACHE_DIR }}/QGIS/qgis-deps-${{ env.QGIS_DEPS_VERSION }}
           key: mac-qgis-deps-v4-${{ env.QGIS_DEPS_VERSION }}

diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
@@ -49,7 +49,7 @@ jobs:
           pull_image_and_stages: ${{ github.event_name != 'workflow_dispatch' }}
 
       - name: Prepare build cache for pull request
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         if: github.event_name == 'pull_request'
         with:
           path: ${{ github.workspace }}/.ccache
@@ -63,7 +63,7 @@ jobs:
 
       - name: Prepare build cache for branch/tag
         # use a fork of actions/cache@v2 to upload cache even when the build or test failed
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         if: github.event_name != 'pull_request'
         with:
           path: ${{ github.workspace }}/.ccache

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -94,7 +94,7 @@ jobs:
           docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"
 
       - name: Prepare build cache for pull request
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         if: github.event_name == 'pull_request'
         with:
           path: /home/runner/QGIS/.ccache
@@ -108,7 +108,7 @@ jobs:
 
       - name: Prepare build cache for branch/tag
         # use a fork of actions/cache@v2 to upload cache even when the build or test failed
-        uses: pat-s/always-upload-cache@v2.1.3
+        uses: pat-s/always-upload-cache@v2.1.5
         if: github.event_name != 'pull_request'
         with:
           path: /home/runner/QGIS/.ccache

diff --git a/cmake/FindOpenCLhpp.cmake b/cmake/FindOpenCLhpp.cmake
@@ -19,7 +19,7 @@ if (OPENCL_HPP_INCLUDE_DIR)
     SET(OPENCL_HPP_FOUND TRUE)
 else ()
     find_path(OPENCL_HPP_INCLUDE_DIR
-        NAMES CL/cl2.hpp
+        NAMES CL/opencl.hpp CL/cl2.hpp
         PATHS
         ${LIB_DIR}/include
         "$ENV{LIB_DIR}/include"
@@ -36,6 +36,19 @@ endif ()
 
 
 if (OPENCL_HPP_FOUND)
+    # see if newer opencl.hpp file exists in include dir -- if so we should use this
+    # instead of the deprecated cl2.hpp header
+    find_path(OPENCL_HPP_RENAMED_PATH
+        NAMES CL/opencl.hpp
+        PATHS
+        ${OPENCL_HPP_INCLUDE_DIR}
+    )
+    if (OPENCL_HPP_RENAMED_PATH)
+        SET(OPENCL_USE_NEW_HEADER TRUE)
+    else ()
+        SET(OPENCL_USE_NEW_HEADER FALSE)
+    endif ()
+
     if (NOT OPENCLHPP_FIND_QUIETLY)
         message(STATUS "Found OpenCL C++ headers: ${OPENCL_HPP_INCLUDE_DIR}")
     endif ()

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -70,6 +70,7 @@
 #cmakedefine HAVE_SERVER_PYTHON_PLUGINS
 
 #cmakedefine HAVE_OPENCL
+#cmakedefine OPENCL_USE_NEW_HEADER
 
 #cmakedefine ENABLE_MODELTEST
 
@@ -97,5 +98,7 @@
 #define PDAL_VERSION_MINOR "${PDAL_VERSION_MINOR}"
 #define PDAL_VERSION_MICRO "${PDAL_VERSION_MICRO}"
 
+#cmakedefine ENABLE_TESTS
+
 #endif
 
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -19,10 +19,17 @@ This page tries to maintain a list with incompatible changes that happened in pr
 QGIS 3.20        {#qgis_api_break_3_20}
 =========
 
+QgsMapRendererJob       {#qgis_api_break_3_20_qgsmaprendererjob}
+-----------------
+
+- QgsMapRendererJob::start is no longer virtual. It has been replaced with QgsMapRendererJob::startPrivate. The method QgsMapRendererJob::start checks if the map can be rendered before calling QgsMapRendererJob::startPrivate.
+Subclasses have to implement the virtual method startPrivate to start the rendering of the map. For the actual subclasses (QgsMapRendererParallelJob, QgsMapRendererSequentialJob, ...), the start method
+is replaced by startPrivate method without change.
+
 setDataSource       {#qgis_api_break_3_20_setdatasource}
 -------------
 
-- QgsMapLayer::setDataSource is no longer virtual. If has been replaced with QgsMapLayer::setDataSourcePrivate. This is only relevant for subclassing QgsMapLayer, for code that only uses the subclasses (QgsVectorLayer, QgsRasterLayer, ...) this has no effect.
+- QgsMapLayer::setDataSource is no longer virtual. It has been replaced with QgsMapLayer::setDataSourcePrivate. This is only relevant for subclassing QgsMapLayer, for code that only uses the subclasses (QgsVectorLayer, QgsRasterLayer, ...) this has no effect.
 
 QGIS 3.4        {#qgis_api_break_3_4}
 ========

diff --git a/python/3d/auto_additions/qgsabstractmaterialsettings.py b/python/3d/auto_additions/qgsabstractmaterialsettings.py
@@ -2,18 +2,25 @@
 QgsAbstractMaterialSettings.RenderingTechnique = QgsMaterialSettingsRenderingTechnique
 # monkey patching scoped based enum
 QgsAbstractMaterialSettings.Triangles = QgsMaterialSettingsRenderingTechnique.Triangles
+QgsAbstractMaterialSettings.Triangles.is_monkey_patched = True
 QgsAbstractMaterialSettings.Triangles.__doc__ = "Triangle based rendering (default)"
 QgsAbstractMaterialSettings.Lines = QgsMaterialSettingsRenderingTechnique.Lines
+QgsAbstractMaterialSettings.Lines.is_monkey_patched = True
 QgsAbstractMaterialSettings.Lines.__doc__ = "Line based rendering, requires line data"
 QgsAbstractMaterialSettings.InstancedPoints = QgsMaterialSettingsRenderingTechnique.InstancedPoints
+QgsAbstractMaterialSettings.InstancedPoints.is_monkey_patched = True
 QgsAbstractMaterialSettings.InstancedPoints.__doc__ = "Instanced based rendering, requiring triangles and point data"
 QgsAbstractMaterialSettings.Points = QgsMaterialSettingsRenderingTechnique.Points
+QgsAbstractMaterialSettings.Points.is_monkey_patched = True
 QgsAbstractMaterialSettings.Points.__doc__ = "Point based rendering, requires point data"
 QgsAbstractMaterialSettings.TrianglesWithFixedTexture = QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture
+QgsAbstractMaterialSettings.TrianglesWithFixedTexture.is_monkey_patched = True
 QgsAbstractMaterialSettings.TrianglesWithFixedTexture.__doc__ = "Triangle based rendering, using a fixed, non-user-configurable texture (e.g. for terrain rendering)"
 QgsAbstractMaterialSettings.TrianglesFromModel = QgsMaterialSettingsRenderingTechnique.TrianglesFromModel
+QgsAbstractMaterialSettings.TrianglesFromModel.is_monkey_patched = True
 QgsAbstractMaterialSettings.TrianglesFromModel.__doc__ = "Triangle based rendering, using a model object source"
 QgsAbstractMaterialSettings.TrianglesDataDefined = QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined
+QgsAbstractMaterialSettings.TrianglesDataDefined.is_monkey_patched = True
 QgsAbstractMaterialSettings.TrianglesDataDefined.__doc__ = "Triangle based rendering with possibility of datadefined color \since QGIS 3.18"
 QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``TrianglesWithFixedTexture``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture.__doc__ + '\n' + '* ``TrianglesFromModel``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesFromModel.__doc__ + '\n' + '* ``TrianglesDataDefined``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined.__doc__
 # --