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: |

.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,7 +32,7 @@ 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
@@ -47,10 +47,11 @@ jobs:
             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
@@ -95,15 +96,17 @@ jobs:
       - 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"
 

.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 }}
 

.github/workflows/win.yml

@@ -25,13 +25,13 @@ concurrency:
 jobs:
   win64_build:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
-    runs-on: windows-2022
+    runs-on: windows-2025
 
     env:
       VS_VERSION: "2022"
       # we can't reference other variables within, so make sure the year in path is same as VS_VERSION
       VCINSTALLDIR: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/"
-      CMAKE_VERSION: '3.31.6'
+      CMAKE_VERSION: '4.3.2'
       VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
       TRIPLET: x64-windows
       CMAKE_GENERATOR: "Visual Studio 17 2022" # see https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md

CMakeLists.txt

@@ -29,7 +29,7 @@ if (ANDROID_ABI)
   set(ANDROID_ARM_NEON ON)
 
   # Target/Minimum API levels for Android, used as MerginMaps target properties
-  set(MM_ANDROID_TARGET_SDK_VERSION "35")
+  set(MM_ANDROID_TARGET_SDK_VERSION "36")
   set(MM_ANDROID_MIN_SDK_VERSION "${ANDROIDAPI}")
   set(MM_ANDROID_NDK_PATH "$ENV{ANDROID_NDK_HOME}")
   if (NOT MM_ANDROID_NDK_PATH)
@@ -182,13 +182,19 @@ find_package(
   REQUIRED
 )
 
-# Qt by default assumes that cmake files live in `lib/cmake`. Point to `share` instead.
-# See
-# https://github.com/qt/qtbase/blob/39290c508e2c7fa816c6f79b3eb284adc0cad3c0/src/corelib/Qt6AndroidMacros.cmake#L1016C16-L1026
 if (ANDROID)
-  get_filename_component(
-    QT_ANDROID_PATH_CMAKE_DIR_${ANDROID_ABI} "${Qt6_DIR}/.." ABSOLUTE
+  # Android requires access to private headers for AndroidUtils
+  find_package(
+    Qt6
+    COMPONENTS CorePrivate
+    REQUIRED
   )
+
+  # Qt by default assumes that cmake files live in `lib/cmake`. Point to `share` instead.
+  # See
+  # https://github.com/qt/qtbase/blob/7ddbc87d8e14ce51d2957ea72d0a6077593d5ff4/src/corelib/Qt6AndroidMacros.cmake#L1281-L1296
+  cmake_path(SET QT_ANDROID_PATH_CMAKE_DIR_${ANDROID_ABI} "${Qt6_DIR}/..")
+  cmake_path(ABSOLUTE_PATH QT_ANDROID_PATH_CMAKE_DIR_${ANDROID_ABI} NORMALIZE)
   message(
     STATUS
       "QT_ANDROID_PATH_CMAKE_DIR_${ANDROID_ABI}: ${QT_ANDROID_PATH_CMAKE_DIR_${ANDROID_ABI}}"

INSTALL.md

@@ -139,7 +139,7 @@ Steps to build and run mobile app:
       bison flex lcov nasm libxrandr-dev xvfb
    ```
 
-   Also install CMake 3.x, Ninja and ccache
+   Also install CMake, Ninja and ccache
 
 2. Install vcpkg and checkout to correct version from file `VCPKG_BASELINE`
    Read [vcpkg](#vcpkg) section.
@@ -426,7 +426,7 @@ mobile app for Android on Windows, please help us to update this section.
 
 1. Setup development environment
    - XCode
-   - install deps, see requirements in `.github/workflows/ios.yml`. Most specifically cmake 3.x, ninja, bison and flex (on PATH)
+   - install deps, see requirements in `.github/workflows/ios.yml`. Most specifically cmake, ninja, bison and flex (on PATH)
    - if you want to build for production, you need development certificates. These are not needed for local development, signing is handled automatically (see IOS_USE_PRODUCTION_SIGNING cmake variable for more info). You can get the certificates by following:
        - Get device UDID: either iTunes or about this mac->system report->USB->find iPAD (Serial Number)
        - Create dev iOS certificate for development
@@ -506,12 +506,7 @@ Once the project is opened, build it from Xcode.
 ```
    brew install cmake automake bison flex gnu-sed autoconf-archive libtool ninja pkg-config
 ```
-   install cmake 3.x
 
-   Note: 
-   - cmake 4.0.1 is broken (empty -isysroot)
-   - TODO test with cmake 4.0.3 which is today's 
-
 2. Install vcpkg and checkout to correct version from file `VCPKG_BASELINE`
    Read [vcpkg](#vcpkg) section.
 

VCPKG_BASELINE

@@ -1 +1 @@
-d6995a0cf3cafda5e9e52749fad075dd62bfd90c
+a78b96b07eb590c59bde5db0f4b260bda45ba92d

app/CMakeLists.txt

@@ -439,7 +439,7 @@ if (IOS)
       PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER
                  "LutraConsultingLtd.Input.AppStore"
                  XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY
-                 "iPhone Distribution: LUTRA CONSULTING LIMITED (79QMH2QRAH)"
+                 "Apple Distribution: LUTRA CONSULTING LIMITED (79QMH2QRAH)"
                  XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Manual"
     )
     message(STATUS "Using manual code sign with production certificate")
@@ -484,6 +484,10 @@ target_link_libraries(
          Qt6::Widgets
 )
 
+if (ANDROID)
+  target_link_libraries(MerginMaps PRIVATE Qt6::CorePrivate)
+endif ()
+
 if (HAVE_BLUETOOTH)
   target_link_libraries(MerginMaps PUBLIC Qt6::Bluetooth)
 endif ()

app/androidutils.cpp

@@ -186,40 +186,6 @@ QString AndroidUtils::getDeviceModel()
   return deviceModel;
 }
 
-QVector<int> AndroidUtils::getSafeArea()
-{
-  QVector<int> ret;
-
-#ifdef ANDROID
-  const auto activity = QJniObject( QNativeInterface::QAndroidApplication::context() );
-  const auto safeArrayStringObj = activity.callMethod<jintArray>( "getSafeArea", "()Ljava/lang/String;" );
-
-  if ( safeArrayStringObj.isValid() )
-  {
-    const QString safeArrayString = safeArrayStringObj.toString();
-
-    QStringList stringParts = safeArrayString.split( "," );
-    if ( stringParts.length() != 4 )
-    {
-      CoreUtils::log( "SafeArea", "Android returned malformed string from getSafeArea method" );
-      return ret;
-    }
-
-    const int top = stringParts[0].toInt(); // top inset
-    const int right = stringParts[1].toInt(); // right inset
-    const int bottom = stringParts[2].toInt(); // bottom inset
-    const int left = stringParts[3].toInt(); // left inset
-
-    ret << top << right << bottom << left;
-    return ret;
-  }
-
-  CoreUtils::log( "SafeArea", "Android returned null from getSafeArea method" );
-  return ret;
-#endif
-  return ret;
-}
-
 void AndroidUtils::hideSplashScreen()
 {
 #ifdef ANDROID

app/androidutils.h

@@ -58,8 +58,6 @@ class AndroidUtils: public QObject
 
     static QString getManufacturer();
     static QString getDeviceModel();
-    Q_INVOKABLE QVector<int> getSafeArea();
-
     static void hideSplashScreen();
 
     /**

app/bluetoothdiscoverymodel.cpp

@@ -108,7 +108,7 @@ void BluetoothDiscoveryModel::setDiscovering( bool discovering )
   if ( discovering )
   {
     mDiscoveryAgent->start();
-    CoreUtils::log( QStringLiteral( "Bluetooth discovery" ), QStringLiteral( "Started discovering devices, method %1" ).arg( mDiscoveryAgent->supportedDiscoveryMethods() ) );
+    CoreUtils::log( QStringLiteral( "Bluetooth discovery" ), QStringLiteral( "Started discovering devices, method %1" ).arg( static_cast<int>( mDiscoveryAgent->supportedDiscoveryMethods() ) ) );
   }
   else
   {