Qt 6.10.3, QGIS 3.44.10 upgrade

.github/workflows/android.yml

@@ -35,20 +35,19 @@ jobs:
             ANDROID_ABI: 'arm64-v8a'
             BUILD_OFFSET: 50
 
-    runs-on: macos-15
+    runs-on: macos-26
     env:
       NDK_VERSION: 'r27' # '27.2.12479018'
       NDK_VERSION_FULL: r27c
       JDK_VERSION: 17
-      SDK_PLATFORM: android-35
-      ANDROIDAPI: 24
+      SDK_PLATFORM: android-36
       VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
-      SDK_BUILD_TOOLS: 34.0.0
-      CMAKE_VERSION: '3.31.6'
+      SDK_BUILD_TOOLS: 36.0.0
+      CMAKE_VERSION: '4.3.2'
       QT_ANDROID_KEYSTORE_ALIAS: input
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
-      XC_VERSION: ${{ '16.2' }}
+      XC_VERSION: ${{ '26.4.1' }}
       VCPKG_ROOT: '${{ github.workspace }}/vcpkg'
       LC_ALL: 'en_US.UTF-8' #fastlane
       LANG: 'en_US.UTF-8' #fastlane
@@ -97,7 +96,7 @@ jobs:
           cmakeVersion: ${{ env.CMAKE_VERSION }}
 
       - name: Setup XCode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
+        uses: maxim-lobanov/setup-xcode@v1.7.0
         with:
           xcode-version: ${{ env.XC_VERSION }}
 
@@ -126,13 +125,15 @@ jobs:
           add-to-path: true
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ env.JDK_VERSION }}
           distribution: zulu
 
       - name: Setup Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.7
+        uses: android-actions/setup-android@v4
+        with:
+          packages: ''
 
       - name: Install Android Tools
         run: |
@@ -265,26 +266,24 @@ jobs:
           path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}-${{ matrix.ANDROID_ABI }}.apk
           name: Mergin Maps ${{ env.MM_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}]
 
-      - name: Deploy App to Google play - Internal app sharing
-        if: ${{ !(github.ref_name == 'master' || github.ref_type == 'tag') }}
-        run: |
-          cd ${{ github.workspace }}/mm/fastlane
-          FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing apk_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}-${{ matrix.ANDROID_ABI }}.apk)
-
-          echo "$FASTLANE_OUTPUT"
-          SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}')
-          echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY
-
-          # Write the Play Store link into this job's check run output
-          curl -s -X PATCH \
-            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2026-03-10" \
-            "https://api.github.com/repos/${{ github.repository }}/check-runs/${{ job.check_run_id }}" \
-            -d "{\"output\":{\"title\":\"Android ${{ matrix.ANDROID_ABI }}\",\"summary\":\"$SHARE_URL\"}}"
+#      - name: Deploy App to Google play - Internal app sharing
+#        run: |
+#          cd ${{ github.workspace }}/mm/fastlane
+#          FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing apk_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}-${{ matrix.ANDROID_ABI }}.apk)
+#
+#          echo "$FASTLANE_OUTPUT"
+#          SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}')
+#          echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY
+#
+#          # Write the Play Store link into this job's check run output
+#          curl -s -X PATCH \
+#            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+#            -H "Accept: application/vnd.github+json" \
+#            -H "X-GitHub-Api-Version: 2026-03-10" \
+#            "https://api.github.com/repos/${{ github.repository }}/check-runs/${{ job.check_run_id }}" \
+#            -d "{\"output\":{\"title\":\"Android ${{ matrix.ANDROID_ABI }}\",\"summary\":\"$SHARE_URL\"}}"
 
       - name: Build AAB
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
@@ -295,7 +294,6 @@ jobs:
           find . | grep .aab
 
       - name: Rename AAB artefacts
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         run: |
           mv \
             ${{ github.workspace }}/build-mm/app/android-build/build/outputs/bundle/release/android-build-release.aab \
@@ -309,7 +307,6 @@ jobs:
           name: Mergin Maps ${{ env.MM_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}]
 
       - name: Deploy App to Google play - Internal app sharing
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         run: |
           cd ${{ github.workspace }}/mm/fastlane
           FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing aab_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}-${{ matrix.ANDROID_ABI }}.aab)

.github/workflows/code_style.yml

@@ -17,10 +17,6 @@ on:
     types:
       - published
 
-env:
-  QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
-  CACHE_VERSION: 0
-
 jobs:
   code_style_cpp:
     name: C++ code convention check

.github/workflows/gallery.yml

@@ -20,15 +20,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          os: [ubuntu-latest, macos-15, windows-2022]
+          os: [ubuntu-latest, macos-26, windows-latest]
     runs-on: ${{ matrix.os }}
     env:
-      QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.10.3'
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 1
-      XC_VERSION: ${{ '16.2' }} # macos-only
+      XC_VERSION: ${{ '26.4.1' }} # macos-only
       VS_VERSION: "2022" # win-only
-      QT_ARCH: "win64_msvc2022_64" # win-only
 
     steps:
       - uses: actions/checkout@v6

.github/workflows/i18n.yml

@@ -11,7 +11,7 @@ jobs:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: ubuntu-latest
     env:
-      QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.10.3'
     steps:
 
       - uses: actions/checkout@v6

.github/workflows/ios.yml

@@ -20,14 +20,13 @@ on:
       - published
 
 env:
-  CMAKE_VERSION: '3.31.6'
+  CMAKE_VERSION: '4.3.2'
   VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
   VCPKG_ROOT: '${{ github.workspace }}/vcpkg'
-  XC_VERSION: ${{ '16.4' }}
-  DEPLOYMENT_TARGET: '14.0'
+  XC_VERSION: ${{ '26.4.1' }}
   TRIPLET: arm64-ios
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
-  KEYCHAIN: ${{ 'inputapp.keychain' }}
+  KEYCHAIN: ${{ 'mmapp.keychain' }}
 
 concurrency:
   group: ci-${{github.ref}}-ios
@@ -36,7 +35,7 @@ concurrency:
 jobs:
   ios_build:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -57,7 +56,7 @@ jobs:
           cmakeVersion: ${{ env.CMAKE_VERSION }}
 
       - name: Setup XCode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
+        uses: maxim-lobanov/setup-xcode@v1.7.0
         with:
           xcode-version: ${{ env.XC_VERSION }}
 
@@ -163,7 +162,6 @@ jobs:
             -D CMAKE_CXX_VISIBILITY_PRESET=hidden \
             -D CMAKE_SYSTEM_NAME=iOS \
             -D CMAKE_SYSTEM_PROCESSOR=aarch64 \
-            -D CMAKE_OSX_DEPLOYMENT_TARGET=${{ env.DEPLOYMENT_TARGET }} \
             -DIOS=TRUE \
             -DUSE_MM_SERVER_API_KEY=TRUE \
             -DUSE_KEYCHAIN=No \

.github/workflows/linux.yml

@@ -20,7 +20,7 @@ on:
       - published
 
 env:
-  CMAKE_VERSION: '3.31.6'
+  CMAKE_VERSION: '4.3.2'
   VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
   VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
   TRIPLET: x64-linux
@@ -32,25 +32,26 @@ concurrency:
 jobs:
   linux_build:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
           path: mm
 
-      - name: Free Disk Space
+      - name: Free disk space
         uses: jlumbroso/free-disk-space@main
 
-      - name: Install Build Dependencies
+      - name: Install build dependencies
         run: |
             sudo apt-get update -y
 
             sudo apt-get install -y \
-            gperf autopoint '^libxcb.*-dev' libx11-xcb-dev libegl1-mesa libegl1-mesa-dev \
+            gperf autopoint '^libxcb.*-dev' libx11-xcb-dev libegl1-mesa-dev \
             libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev \
-            autoconf-archive libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libfuse2 \
-            bison flex lcov nasm libxrandr-dev xvfb
+            autoconf-archive libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libfuse2t64 \
+            lcov nasm libxrandr-dev mono-complete xvfb libltdl-dev libwayland-dev libwayland-egl-backend-dev \
+            wayland-protocols
 
             # Required to run unit tests on linux
             echo "QT_QPA_PLATFORM=offscreen" >> $GITHUB_ENV
@@ -72,13 +73,13 @@ jobs:
             -k "$MERGINSECRETS_DECRYPT_KEY" \
             -md md5
 
-      - name: ccache
+      - name: Ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: ccache-${{ env.TRIPLET }}
           max-size: 200M
 
-      - name: Install vcpkg
+      - name: Install VCPKG
         shell: bash
         run: |
           mkdir -p "${{ env.VCPKG_ROOT }}"
@@ -92,18 +93,20 @@ jobs:
           chmod +x ./bootstrap-vcpkg.sh
           ./bootstrap-vcpkg.sh
 
-      - name: Setup NuGet Credentials
+      - name: Setup NuGet credentials
         shell: bash
         run: |
-          mono `${{ env.VCPKG_ROOT }}/vcpkg fetch nuget | tail -n 1` \
+          ${{ env.VCPKG_ROOT }}/vcpkg fetch nuget
+
+          mono `${{ env.VCPKG_ROOT }}/vcpkg fetch nuget | head -n 1` \
             sources add \
             -source "https://nuget.pkg.github.com/merginmaps/index.json" \
             -storepasswordincleartext \
             -name "GitHub" \
             -username "mergin-maps-bot" \
             -password "${{ secrets.MERGIN_MAPS_BOT_GITHUB_TOKEN }}"
 
-          mono `${{ env.VCPKG_ROOT }}/vcpkg fetch nuget | tail -n 1` \
+          mono `${{ env.VCPKG_ROOT }}/vcpkg fetch nuget | head -n 1` \
             setapikey "${{ secrets.MERGIN_MAPS_BOT_GITHUB_TOKEN }}" \
             -source "https://nuget.pkg.github.com/merginmaps/index.json"
 
@@ -114,7 +117,7 @@ jobs:
 
             echo "Version code: ${BUILD_NUM}"
 
-      - name: build app (debug)
+      - name: Build app (debug)
         run: |
           mkdir -p build-mm-db
           cd build-mm-db
@@ -133,29 +136,30 @@ jobs:
 
           ninja
 
-      - name: run tests
+      - name: Run tests
         env: 
           QT_QPA_PLATFORM: "offscreen"  
         run: |
           cd build-mm-db/
           xvfb-run --server-args="-screen 0 640x480x24" ctest --output-on-failure
 
-      - name: build lcov summary
+      - name: Build lcov summary
         run: |
           cd build-mm-db
 
           lcov --directory . --capture --output-file coverage.info
 
-          lcov --remove coverage.info '*/vcpkg_installed/*' '*Qt/*' '*/merginsecrets.cpp' '*/test/*' '/usr/*' '/Applications/*' '/opt/*' '*build-mm-db/*' --output-file coverage.info
+          lcov --remove coverage.info '*/vcpkg_installed/*' '*/merginsecrets.cpp' '*/test/*' '/usr/*' '*build-mm-db/*' --output-file coverage.info
           lcov --list coverage.info
 
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: build-mm-db/coverage.info
+          fail-on-error: false
 
-      - name: build app
+      - name: Build app (release)
         run: |
           mkdir -p install-mm
           mkdir -p build-mm
@@ -175,13 +179,13 @@ jobs:
           ninja
           ninja install
 
-      - name: Get TimeStamp
+      - name: Get timestamp
         id: time
         uses: josStorer/get-current-time@v2.0.2
         with:
           format: 'YYYYMMDD'
 
-      - name: package app
+      - name: Package app
         run: |
           MM_TAR=input-${{ env.MM_VERSION_CODE }}-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.tar.gz
           echo "MM_TAR=${MM_TAR}" >> $GITHUB_ENV
@@ -190,7 +194,7 @@ jobs:
           find .
           tar -c -z -f ${{ github.workspace }}/${MM_TAR} ./
 
-      - name: Upload Sdk in Artifacts
+      - name: Upload app to artifacts
         uses: actions/upload-artifact@v6
         with:
           path: ${{ github.workspace }}/${{ env.MM_TAR }}

.github/workflows/macos.yml

@@ -19,11 +19,10 @@ on:
       - published
 
 env:
-  CMAKE_VERSION: '3.31.6'
+  CMAKE_VERSION: '4.3.2'
   VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
   VCPKG_ROOT: '${{ github.workspace }}/vcpkg'
-  XC_VERSION: ${{ '16.4' }}
-  DEPLOYMENT_TARGET: '11.0'
+  XC_VERSION: ${{ '26.4.1' }}
   TRIPLET: arm64-osx
 
 concurrency:
@@ -33,7 +32,7 @@ concurrency:
 jobs:
   macos_build:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -54,7 +53,7 @@ jobs:
           cmakeVersion: ${{ env.CMAKE_VERSION }}
 
       - name: Setup XCode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
+        uses: maxim-lobanov/setup-xcode@v1.7.0
         with:
           xcode-version: ${{ env.XC_VERSION }}