Merge branch 'master' of https://github.com/qgis/QGIS

.ci/ogc/Dockerfile

@@ -17,6 +17,7 @@ RUN apt-get update \
   libzip-dev \
   libprotobuf-dev \
   qtbase5-dev \
+  libdraco-dev \
   libqt5svg5-dev \
   libqt5serialport5-dev \
   qttools5-dev \

.ci/ogc/build.sh

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

.ci/run_tests.sh

@@ -124,7 +124,7 @@ else
 fi
 
 # Create an empty minio folder with appropriate permissions so www user can write inside it
-mkdir -p /tmp/minio_tests/test_bucket && chmod -R 777 /tmp/minio_tests
+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/docker-qgis-build.sh

@@ -5,6 +5,8 @@ set -e
 CTEST_SOURCE_DIR=${CTEST_SOURCE_DIR-/root/QGIS}
 CTEST_BUILD_DIR=${CTEST_BUILD_DIR-/root/QGIS/build}
 
+export LANG="C.UTF-8"
+
 ##############
 # Setup ccache
 ##############
@@ -58,15 +60,6 @@ fi
 
 CMAKE_EXTRA_ARGS=()
 
-if [[ ${BUILD_WITH_QT6} = "ON" ]]; then
-  CMAKE_EXTRA_ARGS+=(
-   "-DQSCINTILLA_INCLUDE_DIR=/usr/include/qt6"
-   "-DQSCINTILLA_LIBRARY=/usr/lib64/libqscintilla2_qt6.so"
-   "-DQWT_INCLUDE_DIR=/usr/local/qwt-6.2.0/include/"
-   "-DQWT_LIBRARY=/usr/local/qwt-6.2.0/lib/libqwt.so.6"
-  )
-fi
-
 if [[ "${WITH_COMPILE_COMMANDS}" == "ON" ]]; then
   CMAKE_EXTRA_ARGS+=(
     "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
@@ -92,6 +85,7 @@ cmake \
  -DWITH_STAGED_PLUGINS=ON \
  -DWITH_GRASS7=${WITH_GRASS7} \
  -DWITH_GRASS8=${WITH_GRASS8} \
+ -DWITH_GRASS_PLUGIN=${WITH_QT5} \
  -DSUPPRESS_QT_WARNINGS=ON \
  -DENABLE_TESTS=ON \
  -DENABLE_MODELTEST=${WITH_QT5} \

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

@@ -24,9 +24,11 @@ RUN  apt-get update \
     dh-python \
     git \
     gdal-bin \
+    gnupg \
     gpsbabel \
     graphviz \
     libaio1 \
+    libdraco4 \
     libexiv2-27 \
     libfcgi0ldbl \
     libgsl27 \
@@ -109,7 +111,10 @@ RUN  apt-get update \
   && apt-get clean
 
 # Node.js and Yarn for server landingpage webapp
-RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update
 RUN apt-get install -y nodejs
 RUN corepack enable
 
@@ -175,6 +180,7 @@ RUN  apt-get update \
     cmake \
     flex \
     grass-dev \
+    libdraco-dev \
     libexiv2-dev \
     libexpat1-dev \
     libfcgi-dev \

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

@@ -1,4 +1,4 @@
-ARG DISTRO_VERSION=36
+ARG DISTRO_VERSION=38
 
 FROM fedora:${DISTRO_VERSION} as single
 MAINTAINER Matthias Kuhn <[email protected]>
@@ -9,6 +9,7 @@ RUN dnf -y --refresh install \
     clang \
     clazy \
     curl \
+    draco-devel \
     exiv2-devel \
     expat-devel \
     fcgi-devel \
@@ -36,6 +37,7 @@ RUN dnf -y --refresh install \
     protobuf-lite-devel \
     python3-devel \
     python3-termcolor \
+    qca-qt6-devel \
     qt6-qt3d-devel \
     qt6-qtbase-devel \
     qt6-qtbase-private-devel \
@@ -47,6 +49,9 @@ RUN dnf -y --refresh install \
     qt6-qtdeclarative-devel \
     qt6-qt5compat-devel \
     qt6-qtmultimedia-devel \
+    qtkeychain-qt6-devel \
+    qwt-qt6-devel \
+    qscintilla-qt6-devel \
     spatialindex-devel \
     sqlite-devel \
     unzip \
@@ -65,42 +70,6 @@ RUN dnf -y --refresh install \
     patch \
     dos2unix
 
-RUN cd /usr/src \
-  && wget https://github.com/KDE/qca/archive/refs/heads/master.zip \
-  && unzip master.zip \
-  && rm master.zip \
-  && mkdir build \
-  && cd build \
-  && cmake -DQT6=ON -DBUILD_TESTS=OFF -GNinja -DCMAKE_INSTALL_PREFIX=/usr/local ../qca-master \
-  && ninja install
-
-RUN cd /usr/src \
-  && wget https://github.com/frankosterfeld/qtkeychain/archive/841f31c7ca177e45647fd705200d7fcbeee056e5/master.zip \
-  && unzip master.zip \
-  && rm master.zip \
-  && cd qtkeychain-841f31c7ca177e45647fd705200d7fcbeee056e5 \
-  && cmake -DBUILD_WITH_QT6=ON -DBUILD_TRANSLATIONS=OFF -DCMAKE_INSTALL_PREFIX=/usr/local -GNinja \
-  && ninja install
-
-RUN cd /usr/src \
-  && wget https://sourceforge.net/projects/qwt/files/qwt/6.2.0/qwt-6.2.0.zip/download \
-  && unzip download \
-  && cd qwt-6.2.0 \
-  && dos2unix qwtconfig.pri \
-  && printf '140c140\n< QWT_CONFIG     += QwtExamples\n---\n> #QWT_CONFIG     += QwtExamples\n151c151\n< QWT_CONFIG     += QwtPlayground\n---\n> #QWT_CONFIG     += QwtPlayground\n158c158\n< QWT_CONFIG     += QwtTests\n---\n> #QWT_CONFIG     += QwtTests\n' | patch qwtconfig.pri \
-  && qmake6 qwt.pro \
-  && make -j4 \
-  && make install
-
-
-RUN cd /usr/src \
-  && wget https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.3/QScintilla_src-2.13.3.zip \
-  && unzip QScintilla_src-2.13.3.zip \
-  && rm QScintilla_src-2.13.3.zip \
-  && cd QScintilla_src-2.13.3 \
-  && qmake6 src/qscintilla.pro \
-  && make -j4 \
-  && make install
 
 # Oracle : client side
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-basic-linux.x64-19.9.0.0.0dbru.zip > instantclient-basic-linux.x64-19.9.0.0.0dbru.zip

.github/CONTRIBUTING.md

@@ -11,9 +11,13 @@ by running the prepare commit script **before** issuing `git commit`.
 
     ./scripts/prepare_commit.sh
 
-This can be automated by setting up the pre-commit hook properly.
+This can be automated by adding it to a pre-commit hook, for example:
 
-    ln -s ../../scripts/prepare_commit.sh .git/hooks/pre-commit
+    pushd $(git rev-parse --git-common-dir)/hooks
+    test -e pre-commit && mv pre-commit pre-commit.000
+    echo '$(git rev-parse --show-toplevel)/scripts/prepare_commit.sh' > pre-commit
+    chmod +x pre-commit
+    popd
 
 Getting your pull request merged
 --------------------------------

.github/ISSUE_TEMPLATE/10_bug_report.yml

@@ -51,7 +51,7 @@ body:
         Each month, there is a new release of QGIS. According to the release schedule, you should at least be running a supported QGIS version.
         You can check the release schedule https://www.qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule
       options:
-        - label: I'm running a supported QGIS version according to the roadmap.
+        - label: I'm running a supported QGIS version according to [the roadmap](https://www.qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule).
 
   - type: checkboxes
     id: new-profile
@@ -63,7 +63,7 @@ body:
         Read this link how to create a new profile
         https://docs.qgis.org/latest/en/docs/user_manual/introduction/qgis_configuration.html#working-with-user-profiles
       options:
-        - label: I tried with a new QGIS profile
+        - label: I tried with a new [QGIS profile](https://docs.qgis.org/latest/en/docs/user_manual/introduction/qgis_configuration.html#working-with-user-profiles)
 
   - type: textarea
     id: additional-context

.github/workflows/build-docker.yml

@@ -34,7 +34,7 @@ jobs:
           if [[ "${GITHUB_REF}" =~ ^refs/tags ]]; then
             echo "matrix={\"branch\":[\"${GITHUB_REF##*/}\"]}" >> $GITHUB_OUTPUT
           else
-            echo "matrix={\"branch\":[\"master\", \"release-3_30\", \"release-3_28\"]}" >> $GITHUB_OUTPUT
+            echo "matrix={\"branch\":[\"master\", \"release-3_34\", \"release-3_28\"]}" >> $GITHUB_OUTPUT
           fi
 
   build-docker:
@@ -55,6 +55,14 @@ jobs:
       matrix: ${{ fromJSON( needs.define-strategy.outputs.matrix ) }}
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
+
       - name: Free additional space
         run: |
           df -h
@@ -70,7 +78,7 @@ jobs:
 
       - name: Cache
         id: cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.ccache
           key: docker-build-${{ matrix.branch }}-${{ github.sha }}
@@ -79,7 +87,7 @@ jobs:
             docker-build-master-
 
       - name: checkout ${{ matrix.branch }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
 

.github/workflows/code_layout.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10' 
+          python-version: '3.10'
       - name: Install requirements
         run: |
           wget https://www.doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           sudo apt install -y \
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Requirements
         run: |
             sudo apt install -y \
@@ -68,47 +68,55 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run Banned Keywords Test
         run: ./tests/code_layout/test_banned_keywords.sh
 
+  class_name_check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run class naming conventions check
+        run: ./tests/code_layout/test_class_names.sh
+
   def_window_title_check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Def Window Title Test
         run: ./tests/code_layout/test_defwindowtitle.sh
 
   qgsscrollarea_check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run QgsScrollArea check
         run: ./tests/code_layout/test_qgsscrollarea.sh
 
   qvariant_no_brace_init:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: No brace initialization of QVariant variables
         run: ./tests/code_layout/test_qvariant_no_brace_init.sh
 
   qt_module_wide_imports:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: No module-wide imports of Qt modules
         run: ./tests/code_layout/test_qt_imports.sh
 
   doxygen_layout_check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           sudo apt install -y \
@@ -122,7 +130,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 100
       - name: Install Requirements
@@ -138,13 +146,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Requirements
         run: |
           sudo apt install -y \
               expect \
               silversearcher-ag
-      - uses: tj-actions/changed-files@v35
+      - uses: tj-actions/changed-files@v40
         id: changed_files
         with:
           separator: ' '
@@ -179,19 +187,19 @@ jobs:
           python -m pip install --upgrade pip
           pip install autopep8 nose2 mock termcolor
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Sip Checks
         run: ./tests/code_layout/sipify/test_sipify.sh
       - name: Sip Include Test
         run: ./tests/code_layout/sipify/test_sip_include.sh
       - name: Sip Files Up To Date
         run: ./tests/code_layout/sipify/test_sipfiles.sh
 
-  cppcheck_18_04:
-    runs-on: ubuntu-18.04
+  cppcheck:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Requirements
         run: |

.github/workflows/flake8.yml

@@ -19,7 +19,7 @@ jobs:
           python-version: 3.7
           architecture: x64
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run flake8
         uses: julianwachholz/[email protected]
         with: