sewe2000 · ostr00000 · Feb 13, 2026 · Jan 23, 2026 · Jan 23, 2026 · Jan 23, 2026
diff --git a/.ci/ogc/Dockerfile b/.ci/ogc/Dockerfile
@@ -1,48 +1,94 @@
-FROM ubuntu:latest
+FROM ubuntu:25.10
 RUN  export DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
     && apt-get upgrade -y \
     && apt-get install -y \
-  ccache \
-  cmake \
-  ninja-build \
-  clang \
-  flex \
-  bison \
-  libgeos-dev \
-  libgdal-dev \
-  libzip-dev \
-  libprotobuf-dev \
-  qtbase5-dev \
-  libdraco-dev \
-  libqt5svg5-dev \
-  libqt5serialport5-dev \
-  qtmultimedia5-dev \
-  qttools5-dev \
-  protobuf-compiler \
-  qt5-qmake \
-  qtbase5-dev-tools \
-  qtchooser \
-  qtpositioning5-dev \
-  libqt5webkit5-dev \
-  libqca-qt5-2-dev \
-  libgsl-dev \
-  libspatialindex-dev \
-  qt5keychain-dev \
-  libexiv2-dev \
-  libfcgi-dev \
-  libqt5scintilla2-dev \
-  libqwt-qt5-dev \
-  pyqt5-dev \
-  python3-pyqt5 \
-  python3-pyqt5.qsci \
-  python3-all-dev \
-  python3-dev \
-  python3-sip-dev \
-  pyqt5-dev-tools \
-  spawn-fcgi
+    bison \
+    ccache \
+    clang \
+    cmake \
+    ninja-build \
+    flex \
+    locales \
+    mold \
+    libdraco-dev \
+    libexiv2-dev \
+    libexpat1-dev \
+    libfcgi-dev \
+    libgeographiclib-dev \
+    libgeos-dev \
+    libgdal-dev \
+    libgsl-dev \
+    libpq-dev \
+    libprotobuf-dev \
+    libqca-qt6-dev \
+    libqt6opengl6-dev \
+    libqscintilla2-qt6-dev \
+    libqt6svg6-dev \
+    libspatialite-dev \
+    libsqlite3-dev \
+    libsqlite3-mod-spatialite \
+    libzip-dev \
+    libzstd-dev \
+    protobuf-compiler \
+    pyqt6-dev-tools \
+    pyqt6.qsci-dev \
+    python3-all-dev \
+    python3-dev \
+    python3-gdal \
+    python3-mock \
+    python3-nose2 \
+    python3-numpy \
+    python3-oauthlib \
+    python3-openssl \
+    python3-owslib \
+    python3-pep8 \
+    python3-pexpect \
+    python3-pip \
+    python3-psycopg2 \
+    python3-pyproj \
+    python3-pyqt6 \
+    python3-pyqt6.qsci \
+    python3-pyqt6.qtsvg \
+    python3-pyqt6.qtpositioning \
+    python3-pyqt6.qtmultimedia \
+    python3-pyqt6.qtserialport \
+    python3-pyqt6.qtwebengine \
+    python3-pyqt6.sip \
+    python3-pyqtbuild \
+    python3-requests \
+    python3-shapely  \
+    python3-geopandas \
+    python3-sphinx \
+    python3-sipbuild \
+    python3-six \
+    python3-termcolor \
+    python3-yaml \
+    libsfcgal-dev \
+    sip-tools \
+    qmake6 \
+    qt6-3d-dev \
+    qtkeychain-qt6-dev \
+    qt6-base-dev \
+    qt6-declarative-dev-tools \
+    qt6-positioning-dev \
+    qt6-multimedia-dev \
+    qt6-tools-dev \
+    qt6-tools-dev-tools \
+    qt6-base-private-dev \
+    qt6-5compat-dev \
+    qt6-webengine-dev \
+    qt6-pdf-dev \
+    qt6-serialport-dev \
+    opencl-headers \
+    ocl-icd-opencl-dev \
+    spawn-fcgi
+
+RUN echo "C UTF-8" > /etc/locale.gen
+RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+RUN locale-gen
 
 ADD qgis_mapserv.sh /root/qgis_mapserv.sh
 CMD ["sh", "/root/qgis_mapserv.sh"]
diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -5,6 +5,8 @@ set -e
 mkdir -p /usr/src/qgis/build
 cd /usr/src/qgis/build || exit 1
 
+export LANG="C.UTF-8"
+
 export CCACHE_TEMPDIR=/tmp
 # Github workflow cache max size is 2.0, but ccache data get compressed (roughly 1/5?)
 ccache -M 2.0G
@@ -16,12 +18,12 @@ ccache -z
 # To make ccache work properly with precompiled headers
 ccache --set-config sloppiness=pch_defines,time_macros,include_file_mtime,include_file_ctime
 
+# -DWITH_INTERNAL_SPATIALINDEX=ON because of broken libspatialindex 2.1 on Ubuntu 25.10
 cmake -GNinja \
  -DUSE_CCACHE=ON \
  -DWITH_QUICK=OFF \
  -DWITH_3D=OFF \
  -DWITH_STAGED_PLUGINS=OFF \
- -DBUILD_WITH_QT6=OFF \
  -DWITH_GRASS=OFF \
  -DENABLE_MODELTEST=OFF \
  -DENABLE_PGTEST=OFF \
@@ -34,9 +36,11 @@ cmake -GNinja \
  -DWITH_GSL=OFF \
  -DWITH_DESKTOP=OFF \
  -DWITH_GUI=OFF \
+ -DWITH_GEOGRAPHICLIB=ON \
  -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
  -DWITH_SERVER_PLUGINS=ON \
+ -DWITH_INTERNAL_SPATIALINDEX=ON \
  -DWITH_ORACLE=OFF \
  -DWITH_PDAL=OFF \
  -DWITH_QTPRINTER=OFF \

diff --git a/.ci/test_blocklist_qt5.txt b/.ci/test_blocklist_qt5.txt
@@ -2,7 +2,6 @@
 test_gui_queryresultwidget
 
 # code layout tests are run on separate build
-qgis_spelling
 qgis_sipify
 qgis_sip_include
 qgis_sip_uptodate

diff --git a/.ci/test_blocklist_qt6_fedora.txt b/.ci/test_blocklist_qt6_fedora.txt
@@ -2,7 +2,6 @@
 test_gui_queryresultwidget
 
 # code layout tests are run on separate build
-qgis_spelling
 qgis_sipify
 qgis_sip_include
 qgis_sip_uptodate

diff --git a/.ci/test_blocklist_qt6_ubuntu.txt b/.ci/test_blocklist_qt6_ubuntu.txt
@@ -2,7 +2,6 @@
 test_gui_queryresultwidget
 
 # code layout tests are run on separate build
-qgis_spelling
 qgis_sipify
 qgis_sip_include
 qgis_sip_uptodate

diff --git a/.clang-tidy b/.clang-tidy
@@ -1,2 +1,2 @@
-Checks: 'bugprone-*,-bugprone-easily-swappable-parameters,-bugprone-virtual-near-miss,-bugprone-suspicious-include'
+Checks: 'bugprone-*,-bugprone-easily-swappable-parameters,-bugprone-virtual-near-miss,-bugprone-suspicious-include,-bugprone-branch-clone'
 HeaderFilterRegex: ''
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -102,6 +102,7 @@ cmake \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
  -DWITH_BINDINGS=ON \
+ -DWITH_GEOGRAPHICLIB=ON \
  -DWITH_SERVER=ON \
  -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_SERVER_LANDINGPAGE_WEBAPP} \
  -DWITH_ORACLE=ON \

diff --git a/.docker/qgis3-fedora-qt6-build-deps.dockerfile b/.docker/qgis3-fedora-qt6-build-deps.dockerfile
@@ -20,6 +20,7 @@ RUN dnf -y --refresh install \
     gdal \
     gdal-devel \
     gdal-python-tools \
+    GeographicLib-devel \
     geos-devel \
     gpsbabel \
     grass \
@@ -95,6 +96,9 @@ RUN dnf -y --refresh install \
     blend2d-devel
 
 
+# download wmm2025 magnetic field model for testing
+RUN geographiclib-get-magnetic wmm2025
+
 # Oracle : client side
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basic-linux.x64-21.16.0.0.0dbru.zip > instantclient-basic-linux.x64-21.16.0.0.0dbru.zip
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip > instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip

diff --git a/.docker/qgis3-ubuntu-qt6-build-deps.dockerfile b/.docker/qgis3-ubuntu-qt6-build-deps.dockerfile
@@ -31,6 +31,7 @@ RUN  apt-get update \
     'libdraco4|libdraco8' \
     libexiv2-28 \
     'libfcgi0ldbl|libfcgi0t64' \
+    libgeographiclib26 \
     libgsl28 \
     'libprotobuf-lite17|libprotobuf-lite23|libprotobuf-lite32t64' \
     libqca-qt6-plugins \
@@ -192,6 +193,7 @@ RUN  apt-get update \
     libexiv2-dev \
     libexpat1-dev \
     libfcgi-dev \
+    libgeographiclib-dev \
     libgeos-dev \
     libgsl-dev \
     libpq-dev \

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,5 @@
 33ea41a100e8eea891c1d9d95fe34e346c3e71d1 # clang-format on non sipified files
 00fecc29bbe2e295d75c2dad4b9090f7afba739a # clang-format src/analysis
 3a4f8bcdad4f843d7217116ac1cb94b6b6c3fb8b # clang-format src/3d + server
+148c4220b0893d34acc61fccdee9e4ad396c4a0b # Mass conversion to use u""_s and ""_L1 operators
+5110dcbc695c0d4867e95449117ddd8f726b8ae1 # substitute QLatin1Char('x') with 'x'_L1