Merge branch 'master' into macdmg

CMakeLists.txt

@@ -1,18 +1,12 @@
 #############################################################
 # CMake settings
-cmake_minimum_required(VERSION 3.12.0)
+cmake_minimum_required(VERSION 3.23.0)
 set(CMAKE_COLOR_MAKEFILE ON)
 set(CMAKE_AUTORCC ON)
 # set path to additional CMake modules
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-# POLICIES
-cmake_policy(SET CMP0048 NEW)
-cmake_policy(SET CMP0053 NEW)
-cmake_policy(SET CMP0071 NEW)
-cmake_policy(SET CMP0082 NEW) # Install rules from add_subdirectory() calls are interleaved with those in caller
-cmake_policy(SET CMP0094 NEW)
+
 if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.27")
-  cmake_policy(SET CMP0144 NEW)
   # include(Dart) still used, as is the "Experimental" target
   cmake_policy(SET CMP0145 OLD)
 endif()
@@ -993,20 +987,6 @@ if (WITH_CORE)
     string(REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
   endif()
 
-  #assume we have escaped compiler directives
-  #eventually we want to change this to new
-  #since we don't need to jump through so many
-  #hoops to escape compiler directives then
-  if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
-    if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
-      cmake_policy(SET CMP0063 NEW)
-    endif()
-    if(MSVC)
-      cmake_policy(SET CMP0020 NEW)
-    endif()
-  endif()
-
   if("${CMAKE_SYSTEM_NAME}"  MATCHES "Linux")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")

python/PyQt6/core/auto_additions/qgis.py

@@ -11115,6 +11115,21 @@
 """
 # --
 Qgis.MeshRangeExtent.baseClass = Qgis
+# monkey patching scoped based enum
+Qgis.PointCloudAccessType.Local.__doc__ = "Local means the source is a local file on the machine"
+Qgis.PointCloudAccessType.Remote.__doc__ = "Remote means it's loaded through a protocol like HTTP"
+Qgis.PointCloudAccessType.__doc__ = """The access type of the data, local is for local files and remote for remote files (over HTTP).
+
+.. seealso:: :py:class:`QgsPointCloudIndex`
+
+.. versionadded:: 3.42
+
+* ``Local``: Local means the source is a local file on the machine
+* ``Remote``: Remote means it's loaded through a protocol like HTTP
+
+"""
+# --
+Qgis.PointCloudAccessType.baseClass = Qgis
 try:
     Qgis.__attribute_docs__ = {'QGIS_DEV_VERSION': 'The development version', 'DEFAULT_SEARCH_RADIUS_MM': 'Identify search radius in mm', 'DEFAULT_MAPTOPIXEL_THRESHOLD': 'Default threshold between map coordinates and device coordinates for map2pixel simplification', 'DEFAULT_HIGHLIGHT_COLOR': 'Default highlight color.  The transparency is expected to only be applied to polygon\nfill. Lines and outlines are rendered opaque.', 'DEFAULT_HIGHLIGHT_BUFFER_MM': 'Default highlight buffer in mm.', 'DEFAULT_HIGHLIGHT_MIN_WIDTH_MM': 'Default highlight line/stroke minimum width in mm.', 'SCALE_PRECISION': 'Fudge factor used to compare two scales. The code is often going from scale to scale\ndenominator. So it looses precision and, when a limit is inclusive, can lead to errors.\nTo avoid that, use this factor instead of using <= or >=.\n\n.. deprecated:: 3.40\n\n   No longer used by QGIS and will be removed in QGIS 4.0.', 'DEFAULT_Z_COORDINATE': 'Default Z coordinate value.\nThis value have to be assigned to the Z coordinate for the vertex.', 'DEFAULT_M_COORDINATE': 'Default M coordinate value.\nThis value have to be assigned to the M coordinate for the vertex.\n\n.. versionadded:: 3.20', 'UI_SCALE_FACTOR': 'UI scaling factor. This should be applied to all widget sizes obtained from font metrics,\nto account for differences in the default font sizes across different platforms.', 'DEFAULT_SNAP_TOLERANCE': 'Default snapping distance tolerance.', 'DEFAULT_SNAP_UNITS': 'Default snapping distance units.'}
     Qgis.version = staticmethod(Qgis.version)

python/PyQt6/core/auto_additions/qgspointcloudindex.py

@@ -0,0 +1,14 @@
+# The following has been generated automatically from src/core/pointcloud/qgspointcloudindex.h
+try:
+    QgsPointCloudNodeId.fromString = staticmethod(QgsPointCloudNodeId.fromString)
+    QgsPointCloudNodeId.__group__ = ['pointcloud']
+except (NameError, AttributeError):
+    pass
+try:
+    QgsPointCloudNode.__group__ = ['pointcloud']
+except (NameError, AttributeError):
+    pass
+try:
+    QgsPointCloudIndex.__group__ = ['pointcloud']
+except (NameError, AttributeError):
+    pass

python/PyQt6/core/auto_generated/geometry/qgsgeometry.sip.in

@@ -121,7 +121,7 @@ geom is transferred.
 %Docstring
 Returns a non-modifiable (const) reference to the underlying abstract geometry primitive.
 
-This is much faster then calling the non-const :py:func:`~QgsGeometry.get` method.
+This is much faster than calling the non-const :py:func:`~QgsGeometry.get` method.
 
 .. note::
 

python/PyQt6/core/auto_generated/pointcloud/qgspointclouddataprovider.sip.in

@@ -121,6 +121,12 @@ emits :py:func:`~QgsPointCloudDataProvider.indexGenerationStateChanged`
 Gets the current index generation state
 %End
 
+    virtual QgsPointCloudIndex index() const;
+%Docstring
+Returns the point cloud index associated with the provider.
+
+Can be None (e.g. the index is being created)
+%End