revert to qt652

MerginMaps · Nov 2, 2023 · ec0f4a4 · ec0f4a4
1 parent b6a4e56
commit ec0f4a4
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -23,14 +23,14 @@ jobs:
     if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     env:
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.5.2' # 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-20231006-201
-      INPUT_SDK_VERSION_ARM64: arm64-android-20231006-201
+      INPUT_SDK_VERSION_ARM: arm-android-20230824-200
+      INPUT_SDK_VERSION_ARM64: arm64-android-20230824-200
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 0

diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
@@ -18,7 +18,7 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
   CACHE_VERSION: 0
 
 jobs:

diff --git a/.github/workflows/gallery.yml b/.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.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
       CACHE_VERSION: 0
       XC_VERSION: ${{ '14.2' }} # macos-only

diff --git a/.github/workflows/i18n.yml b/.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.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
     steps:
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -16,10 +16,10 @@ on:
       - published
 
 env:   
-  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
   XC_VERSION: ${{ '14.2' }}
   IOS_CMAKE_TOOLCHAIN_VERSION: "4.4.0" 
-  INPUT_SDK_VERSION: arm64-ios-20231006-158
+  INPUT_SDK_VERSION: arm64-ios-20230824-157
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -17,8 +17,8 @@ on:
 
 env:
   CCACHE_DIR: ~/.ccache
-  INPUT_SDK_VERSION: x64-linux-20231006-163
-  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+  INPUT_SDK_VERSION: x64-linux-20230824-162
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
   CACHE_VERSION: 0
 
 concurrency:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -16,8 +16,8 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
-  INPUT_SDK_VERSION: x64-osx-20231005-182
+  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
+  INPUT_SDK_VERSION: x64-osx-20230824-181
   CCACHE_DIR: /Users/runner/work/ccache
   CACHE_VERSION: 0
   XC_VERSION: ${{ '14.2' }}

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -25,8 +25,8 @@ jobs:
     runs-on: windows-2019
 
     env:
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
-      INPUT_SDK_VERSION: x64-windows-20231006-210
+      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
+      INPUT_SDK_VERSION: x64-windows-20230824-209
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
       CACHE_VERSION: 0
       VS_VERSION: "2019"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.22)
 set(MM_VERSION_MAJOR "2")
 set(MM_VERSION_MINOR "5")
 set(MM_VERSION_PATCH "0")
-set(QT_VERSION_DEFAULT "6.5.3")
+set(QT_VERSION_DEFAULT "6.5.2")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for
 # Qt6AndroidMacros.cmake

diff --git a/INSTALL.md b/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.3/gcc_64 \
+     -DCMAKE_PREFIX_PATH=~/Qt/6.5.2/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.3/ios \
-    -DQT_HOST_PATH=/opt/Qt/6.5.3/macos \
+    -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/ios \
+    -DQT_HOST_PATH=/opt/Qt/6.5.2/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.3/macos \
+  -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/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.3\msvc2019_64
+set Qt6_DIR=C:\Qt\6.5.2\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
 ```