Capture profile points

.ci/run_tests.sh

@@ -12,7 +12,13 @@ test -n "${DOCKER}" || {
 
 DOCKER_COMPOSE=$(command -v podman-compose docker-compose | head -1)
 test -n "${DOCKER_COMPOSE}" || {
-  DOCKER_COMPOSE="${DOCKER} compose" # TODO: check if supported
+  DOCKER_COMPOSE="${DOCKER} compose"
+  # check if supported
+  ${DOCKER_COMPOSE} > /dev/null || {
+    echo "Cannot find podman-compose or docker-compose, and '${DOCKER_COMPOSE}' fails" >&2
+    echo "HINT: try installing podman-compose" >&2
+    exit 1
+  }
 }
 
 IMAGE_BUILD_DEPS=docker.io/qgis/qgis3-build-deps:latest

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

@@ -156,13 +156,14 @@ RUN  apt-get update \
 
 # HANA: client side
 # Install hdbsql tool
-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 \
-  && rm -rf client \
-  && rm hanaclient*
-ENV PATH="/usr/sap/hdbclient:${PATH}"
+# Does not always work
+# 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 \
+#   && rm -rf client \
+#   && rm hanaclient*
+# ENV PATH="/usr/sap/hdbclient:${PATH}"
 
 # MSSQL: client side
 # RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -

.github/workflows/run-tests.yml

@@ -24,6 +24,7 @@ on:
       - master
       - release-**
       - queued_ltr_backports
+      - capture-profile-points
     # paths cannot be filtered on this workflow on pull request as it is a required one in the branch protection
     # feature request and hacks: https://github.community/t/feature-request-conditional-required-checks/16761
 
@@ -118,7 +119,7 @@ jobs:
           echo QT_VERSION: ${QT_VERSION}
 
       - name: Login to Docker Hub
-        if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
+        if: ${{ github.event_name == 'push' && github.repository == 'qgis/QGIS' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -131,7 +132,7 @@ jobs:
           context: .
           file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
           tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }}
-          push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
+          push: false
           pull: true
           build-args:
             DISTRO_VERSION=${{ matrix.distro-version }}
@@ -296,12 +297,12 @@ jobs:
         run: |
           echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
 
-      - name: Login to Docker Hub
-        if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+      # - name: Login to Docker Hub
+      #   if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
+      #   uses: docker/login-action@v3
+      #   with:
+      #     username: ${{ secrets.DOCKER_USERNAME }}
+      #     password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build Docker Container with Testing Environment
         id: docker-build
@@ -310,7 +311,7 @@ jobs:
           context: .
           file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
           tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
-          push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
+          push: false
           pull: true
           target: ${{ matrix.docker-target }}
           build-args:
@@ -408,7 +409,7 @@ jobs:
           fetch-depth: 2
 
       - name: Login to Docker Hub
-        if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
+        if: ${{ github.event_name == 'push' && github.repository == 'qgis/QGIS' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -421,7 +422,7 @@ jobs:
           context: .
           file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
           tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
-          push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
+          push: ${{ github.event_name == 'push' && github.repository == 'qgis/QGIS' }}
           pull: true
           target: ${{ matrix.docker-target }}
           build-args:

CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_AUTORCC ON)
 # set path to additional CMake modules
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 # POLICIES
-if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.27")
+if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.27")
   # include(Dart) still used, as is the "Experimental" target
   cmake_policy(SET CMP0145 OLD)
 endif()
@@ -435,6 +435,10 @@ if(WITH_CORE)
   # required
   find_package(Proj REQUIRED)
   message(STATUS "Found Proj: ${PROJ_VERSION} ${PROJ_DIR}")
+  if(PROJ_VERSION VERSION_LESS "8.1")
+    message(FATAL_ERROR "Cannot build QGIS using Proj older than 8.1")
+  endif()
+
   find_package(GEOS REQUIRED)
   message(STATUS "Found Geos: ${GEOS_VERSION} ${GEOS_DIR}")
   find_package(GDAL REQUIRED)
@@ -691,8 +695,10 @@ if (ENABLE_TESTS)
   set (PUSH_TO_CDASH FALSE CACHE BOOL "Determines whether test results should be pushed to CDASH site")
   set(QT_USE_QTTEST TRUE)
   enable_testing()
-  # Adds some testing specific build targets e.g. make Experimental
-  include(Dart)
+  if (PUSH_TO_CDASH)
+    # Adds some testing specific build targets e.g. make Experimental
+    include(Dart)
+  endif()
   # Additional test configuration options e.g. max upload size of test report
   configure_file(
     "${CMAKE_SOURCE_DIR}/cmake_templates/CTestCustom.cmake.in"

CONTRIBUTING.md

@@ -14,10 +14,11 @@ You can help us **by submitting bug reports or fixing bugs** in the [QGIS bug tr
 
 If you wish to contribute patches you can:
 
-1. [fork the project](https://help.github.com/forking/)
-1. make your changes
-1. commit to your repository
-1. and then [create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
+1. [Fork the project](https://help.github.com/forking/)
+2. Install the [pre-commit](https://pre-commit.com/) hook: `pre-commit install --install-hooks` (version 4.1+ required)
+3. Make your changes
+4. Commit to your repository
+5. [Create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)
 
  The development team can then review your contribution and commit it upstream as appropriate.
 

INSTALL.md

@@ -23,6 +23,7 @@ Building QGIS from source - step by step
       + [3.11.2. Suggested system tweaks](#3112-suggested-system-tweaks)
       + [3.11.3. Additional tools for QGIS development](#3113-additional-tools-for-qgis-development)
       + [3.11.4. QT6 experimental builds with Fedora Rawhide](#3114-qt6-experimental-builds-with-fedora-rawhide)
+   * [3.12. Building on Linux with vcpkg](#312-building-on-linux-with-vcpkg)
 - [4. Building on Windows](#4-building-on-windows)
    * [4.1. Building with Microsoft Visual Studio](#41-building-with-microsoft-visual-studio)
       + [4.1.1. Visual Studio 2022 Community Edition](#411-visual-studio-2022-community-edition)
@@ -106,7 +107,7 @@ Required build tools:
 Required build dependencies:
 
 * Qt >= 5.15.2
-* Proj >= 7.2.0
+* Proj >= 8.1.0
 * GEOS >= 3.9
 * Sqlite3 >= 3.0.0
 * SpatiaLite >= 4.2.0
@@ -581,27 +582,61 @@ To build,
 cmake .. -DBUILD_WITH_QT6=ON -DWITH_QTWEBKIT=OFF -DWITH_QTWEBENGINE=ON
 ```
 
+## 3.12. Building on Linux with vcpkg
+
+With [vcpkg](https://github.com/microsoft/vcpkg/) you can develop QGIS using
+Qt6 on a Linux system.
+
+First, [Install and initialize vcpkg](https://github.com/microsoft/vcpkg-tool/blob/main/README.md#installuseremove).
+
+Get the QGIS source code:
+
+```sh
+git clone [email protected]:qgis/QGIS.git
+```
+
+Configure:
+
+```sh
+cmake -S . \
+      -B ./build-x64-linux \
+      -GNinja \
+      -DCMAKE_BUILD_TYPE=Debug \
+      -DWITH_VCPKG=ON \
+      -DBUILD_WITH_QT6=ON \
+      -DWITH_QTWEBKIT=OFF \
+      -DWITH_BINDINGS=ON \
+      -DVCPKG_TARGET_TRIPLET=x64-linux-dynamic-release \
+      -DVCPKG_HOST_TRIPLET=x64-linux-dynamic-release
+```
+
+Build:
+
+```sh
+cmake --build ./build-x64-linux
+```
+
 # 4. Building on Windows
 
 ## 4.1. Building with Microsoft Visual Studio
 
-This section describes how to build QGIS using Visual Studio (MSVC) 2019 on Windows.
+This section describes how to build QGIS using Visual Studio (MSVC) 2022 on Windows.
 The official Windows packages are built using OSGeo4W.
 
 This section describes the setup required to allow Visual Studio to be used to
 build QGIS.
 
 ### 4.1.1. Visual Studio 2022 Community Edition
 
-Download and install the [free (as in free beer) Community installer](https://download.visualstudio.microsoft.com/download/pr/68d6b204-9df0-4fcc-abcc-08ee0eff9cb2/b029547488a9383b0c8d8a9c813e246feb3ec19e0fe55020d4878fde5f0983fe/vs_Community.exe)
+Download and install the [free (as in free beer) Community installer](https://c2rsetup.officeapps.live.com/c2r/downloadVS.aspx?sku=community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030:7851336a02d44ba38a548acc719002df)
 
 Select "Desktop Development with C++"
 
 ### 4.1.2. Other tools and dependencies
 
 Download and install following packages:
 
-* [CMake](https://cmake.org/files/v3.12/cmake-3.12.3-win64-x64.msi)
+* [CMake](https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-windows-x86_64.msi)
 * GNU flex, GNU bison and GIT with [cygwin 64bit](https://cygwin.com/setup-x86_64.exe)
 * [OSGeo4W](https://download.osgeo.org/osgeo4w/v2/osgeo4w-setup.exe)
 * [ninja](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip): Copy the `ninja.exe` to `C:\OSGeo4W\bin\`

cmake/FindProj.cmake

@@ -30,7 +30,6 @@ if(NOT PROJ_FOUND)
         OR NOT CMAKE_FIND_FRAMEWORK)
       SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
       SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
-      #FIND_PATH(PROJ_INCLUDE_DIR PROJ/proj_api.h)
       FIND_LIBRARY(PROJ_LIBRARY PROJ)
       IF (PROJ_LIBRARY)
         # FIND_PATH doesn't add "Headers" for a framework
@@ -39,17 +38,11 @@ if(NOT PROJ_FOUND)
       SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
     ENDIF ()
   ENDIF (APPLE)
-  
-  FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
+
+  FIND_PATH(PROJ_INCLUDE_DIR proj.h
     "$ENV{INCLUDE}"
     "$ENV{LIB_DIR}/include"
-    )
-  IF (NOT PROJ_INCLUDE_DIR)
-    FIND_PATH(PROJ_INCLUDE_DIR proj.h
-      "$ENV{INCLUDE}"
-      "$ENV{LIB_DIR}/include"
-      )
-  ENDIF (NOT PROJ_INCLUDE_DIR)
+  )
 
   FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
     "$ENV{LIB}"
@@ -67,27 +60,12 @@ if(NOT PROJ_FOUND)
        STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}")
        STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}")
        STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
-       IF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
-         MESSAGE (FATAL_ERROR "Cannot build QGIS using Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH} Use 7.2.0 or higher.")
-       ENDIF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
-     ELSE(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
-       FILE(READ ${PROJ_INCLUDE_DIR}/proj_api.h proj_version)
-       STRING(REGEX REPLACE "^.*PJ_VERSION ([0-9]+).*$" "\\1" PJ_VERSION "${proj_version}")
-
-       # This will break if 4.10.0 ever will be released (highly unlikely)
-       STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1" PROJ_VERSION_MAJOR "${PJ_VERSION}")
-       STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\2" PROJ_VERSION_MINOR "${PJ_VERSION}")
-       STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\3" PROJ_VERSION_PATCH "${PJ_VERSION}")
-       STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
-
-       # Minimum Proj version required is 4.9.3
-       IF ((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
-         MESSAGE(FATAL_ERROR "Found Proj: ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}. Cannot build QGIS using Proj older than 4.9.3.")
-       ENDIF((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
      ENDIF(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
      IF (NOT PROJ_FIND_QUIETLY)
        MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} version ${PROJ_VERSION_MAJOR} ${PROJ_VERSION_STR}")
      ENDIF (NOT PROJ_FIND_QUIETLY)
+
+     SET(PROJ_VERSION ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH})
 
      INCLUDE_DIRECTORIES(BEFORE SYSTEM ${PROJ_INCLUDE_DIR})
 

cmake/SIPMacros.cmake

@@ -65,11 +65,14 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
     CONFIGURE_FILE(${_sip_file} ${_out_sip_file})
 
     # Deprecated annotation supports message only since version 6.9.0
-    if(${SIP_VERSION_STR} VERSION_LESS 6.9.0)
-      file(READ ${_out_sip_file} _content)
-      string(REGEX REPLACE "([/,])Deprecated=\"[^\"]*\"([/,])" "\\1Deprecated\\2" _content "${_content}")
-      file(GENERATE OUTPUT ${_out_sip_file} CONTENT "${_content}")
-    endif()
+    # if(${SIP_VERSION_STR} VERSION_LESS 6.9.0)
+
+    # For now disabling SIP deprecated because it crashes the application
+    file(READ ${_out_sip_file} _content)
+    string(REGEX REPLACE "([/,])Deprecated=\"[^\"]*\"([/,])" "\\1Deprecated\\2" _content "${_content}")
+    file(GENERATE OUTPUT ${_out_sip_file} CONTENT "${_content}")
+
+    # endif()
 
   ENDFOREACH (_sip_file)
 

debian/control

@@ -85,6 +85,7 @@ Standards-Version: 3.9.7
 Vcs-Browser: https://github.com/qgis/QGIS/
 Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: https://qgis.org/
+Rules-Requires-Root: no
 
 Package: qgis
 Architecture: any

debian/control.in

@@ -43,7 +43,7 @@ Build-Depends:
  opencl-headers,
 #oracle# oracle-instantclient-basiclite,
 #oracle# oracle-instantclient-devel,
- pkg-config,
+ pkgconf,
  pyqt5-dev-tools,
  pyqt5-dev,
  pyqt5.qsci-dev,
@@ -61,7 +61,8 @@ Build-Depends:
  python3-pyqt5.qtserialport,
  python3-pyqt5.qtsql,
  python3-pyqt5.qtsvg,
- python3-pyqtbuild, sip-tools,
+ python3-pyqtbuild,
+ sip-tools,
  python3-termcolor,
  python3-yaml,
  qt3d5-dev,
@@ -99,6 +100,7 @@ Standards-Version: 3.9.7
 Vcs-Browser: https://github.com/qgis/QGIS/
 Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: https://qgis.org/
+Rules-Requires-Root: no
 
 Package: qgis
 Architecture: any
@@ -502,7 +504,7 @@ Description: QGIS server providing various OGC services
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the wms service.
+ This package contains the WMS service.
 
 Package: qgis-server-wmts
 Architecture: any
@@ -514,7 +516,7 @@ Description: QGIS server providing various OGC services
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the wmts service.
+ This package contains the WMTS service.
 
 Package: qgis-server-wfs
 Architecture: any
@@ -526,7 +528,7 @@ Description: QGIS server providing various OGC services
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the wfs service.
+ This package contains the WFS service.
 
 Package: qgis-server-wfs3
 Architecture: any
@@ -538,7 +540,7 @@ Description: QGIS server providing various OGC services
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the wfs 3 service.
+ This package contains the WFS 3 service.
 
 Package: qgis-server-wcs
 Architecture: any
@@ -550,7 +552,7 @@ Description: QGIS server providing various OGC services
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the wcs service.
+ This package contains the WCS service.
 
 Package: qgis-server-landingpage
 Architecture: any