qt653

.github/workflows/android.yml

@@ -23,17 +23,17 @@ jobs:
     if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     env:
-      QT_VERSION: '6.5.2'
+      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
       NDK_VERSION: r25
       NDK_VERSION_FULL: r25b
       JDK_VERSION: 11
       SDK_PLATFORM: android-33
       SDK_BUILD_TOOLS: 33.0.1
-      INPUT_SDK_VERSION_ARM: arm-android-20230824-200
-      INPUT_SDK_VERSION_ARM64: arm64-android-20230824-200
+      INPUT_SDK_VERSION_ARM: arm-android-20231006-201
+      INPUT_SDK_VERSION_ARM64: arm64-android-20231006-201
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
-      CACHE_VERSION: 2
+      CACHE_VERSION: 0
       QT_ANDROID_KEYSTORE_ALIAS: input
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}

.github/workflows/code_style.yml

@@ -18,7 +18,7 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.2'
+  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
   CACHE_VERSION: 0
 
 jobs:

.github/workflows/gallery.yml

@@ -24,7 +24,7 @@ jobs:
           os: [ubuntu-latest, macos-latest, windows-2019]
     runs-on: ${{ matrix.os }}
     env:
-      QT_VERSION: '6.5.2'
+      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 0
       XC_VERSION: ${{ '14.2' }} # macos-only

.github/workflows/i18n.yml

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

.github/workflows/ios.yml

@@ -16,14 +16,14 @@ on:
       - published
 
 env:   
-  QT_VERSION: '6.5.2'
+  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
   XC_VERSION: ${{ '14.2' }}
   IOS_CMAKE_TOOLCHAIN_VERSION: "4.4.0" 
-  INPUT_SDK_VERSION: arm64-ios-20230824-157
+  INPUT_SDK_VERSION: arm64-ios-20231006-158
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 2
+  CACHE_VERSION: 0
 
 concurrency:
   group: ci-${{github.ref}}-ios

.github/workflows/linux.yml

@@ -17,9 +17,9 @@ on:
 
 env:
   CCACHE_DIR: ~/.ccache
-  INPUT_SDK_VERSION: x64-linux-20230824-162
-  QT_VERSION: '6.5.2'
-  CACHE_VERSION: 1
+  INPUT_SDK_VERSION: x64-linux-20231006-163
+  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+  CACHE_VERSION: 0
 
 concurrency:
   group: ci-${{github.ref}}-linux

.github/workflows/macos.yml

@@ -16,10 +16,10 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.2'
-  INPUT_SDK_VERSION: x64-osx-20230824-181
+  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+  INPUT_SDK_VERSION: x64-osx-20231005-182
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 2
+  CACHE_VERSION: 0
   XC_VERSION: ${{ '14.2' }}
 
 concurrency:

.github/workflows/win.yml

@@ -25,10 +25,10 @@ jobs:
     runs-on: windows-2019
 
     env:
-      QT_VERSION: '6.5.2'
-      INPUT_SDK_VERSION: x64-windows-20230824-209
+      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      INPUT_SDK_VERSION: x64-windows-20231006-210
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
-      CACHE_VERSION: 3
+      CACHE_VERSION: 0
       VS_VERSION: "2019"
       QT_ARCH: "win64_msvc2019_64"
 

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.22)
 set(MM_VERSION_MAJOR "2")
 set(MM_VERSION_MINOR "4")
 set(MM_VERSION_PATCH "1")
-set(QT_VERSION_DEFAULT "6.5.2")
+set(QT_VERSION_DEFAULT "6.5.3")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for
 # Qt6AndroidMacros.cmake

INSTALL.md

@@ -126,7 +126,7 @@ Steps to build and run Input:
    mkdir build
    cd build
    cmake -G Ninja \
-     -DCMAKE_PREFIX_PATH=~/Qt/6.5.2/gcc_64 \
+     -DCMAKE_PREFIX_PATH=~/Qt/6.5.3/gcc_64 \
      -DINPUT_SDK_PATH=~/input-sdk/x64-linux \
      -DQGIS_QUICK_DATA_PATH=~/input/app/android/assets/qgis-data \
      ..
@@ -281,8 +281,8 @@ Now you can create a build (either on commmand line or by setting these variable
 
   cmake \
     -DIOS=TRUE \
-    -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/ios \
-    -DQT_HOST_PATH=/opt/Qt/6.5.2/macos \
+    -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.3/ios \
+    -DQT_HOST_PATH=/opt/Qt/6.5.3/macos \
     -DCMAKE_TOOLCHAIN_FILE:PATH="~/input-sdk/ios.toolchain.cmake" \
     -DCMAKE_INSTALL_PREFIX:PATH="../install" \
     -DUSE_SERVER_API_KEY=FALSE \
@@ -318,7 +318,7 @@ export BASE_DIR=~/Projects/quick;
 
 cmake \
   -DCMAKE_BUILD_TYPE=Debug \
-  -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/macos \
+  -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.3/macos \
   -DCMAKE_INSTALL_PREFIX:PATH=$BASE_DIR/install-macos \
   -DINPUT_SDK_PATH=$BASE_DIR/sdk/x64-osx \
   -GNinja \
@@ -346,7 +346,7 @@ For version of the tools used, see `.github/workflows/win.yml`
 - setup build environment
 ```
 set ROOT_DIR=C:\Users\zilol\Projects
-set Qt6_DIR=C:\Qt\6.5.2\msvc2019_64
+set Qt6_DIR=C:\Qt\6.5.3\msvc2019_64
 set PATH=%QT_ROOT%\bin;C:\Program Files\CMake\bin\;%PATH%
 "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x64
 ```

scripts/update_qt_version.bash

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "update_qt_version.bash MAJOR.MINOR.BUILD"
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+VERSION=$1
+VER_PARTS=(${VERSION//./ })
+MAJOR=${VER_PARTS[0]}
+MINOR=${VER_PARTS[1]}
+BUILD=${VER_PARTS[2]}
+
+echo "using QT version $MAJOR.$MINOR.$BUILD"
+
+############
+# CMakeLists
+CMAKE_FILE=$DIR/../CMakeLists.txt
+echo "patching $CMAKE_FILE"
+# e.g. set(QT_VERSION_DEFAULT "6.5.2")
+sed -i.orig -E "s|QT_VERSION_DEFAULT \"[0-9]+.[0-9]+.[0-9]+\"|QT_VERSION_DEFAULT \"${VERSION}\"|g" $CMAKE_FILE
+rm -f $CMAKE_FILE.orig
+
+############
+# INSTALL.md
+INSTALL_FILE=$DIR/../INSTALL.md
+echo "patching $INSTALL_FILE"
+# e.g. /Qt/6.5.2/ unix style
+sed -i.orig -E "s|/Qt/[0-9]+.[0-9]+.[0-9]+/|/Qt/${VERSION}/|g" $INSTALL_FILE
+# e.g. \Qt\6.5.2\ win style
+sed -i.orig -E "s|\\\Qt\\\[0-9]+.[0-9]+.[0-9]+\\\|\\\Qt\\\\${VERSION}\\\|g" $INSTALL_FILE
+rm -f $INSTALL_FILE.orig
+
+############
+# WORKFLOWS
+for FNAME in \
+    $DIR/../.github/workflows/android.yml \
+    $DIR/../.github/workflows/code_style.yml \
+    $DIR/../.github/workflows/gallery.yml \
+    $DIR/../.github/workflows/i18n.yml \
+    $DIR/../.github/workflows/ios.yml \
+    $DIR/../.github/workflows/linux.yml \
+    $DIR/../.github/workflows/macos.yml \
+    $DIR/../.github/workflows/win.yml
+do
+    echo "patching $FNAME"
+    # e.g. QT_VERSION: '6.5.2'
+    sed -i.orig -E "s|QT_VERSION: \'[0-9]+.[0-9]+.[0-9]+\'|QT_VERSION: \'${VERSION}\'|g" $FNAME
+    rm -f $FNAME.orig
+done
+
+# DONE
+echo "patching done"