Merge pull request #2912 from MerginMaps/qt66

Qt 6.6.0 + QR code

.github/workflows/android.yml

@@ -23,17 +23,17 @@ jobs:
     if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: macos-12
     env:
-      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # 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-20231110-205
+      INPUT_SDK_VERSION_ARM64: arm64-android-20231110-205
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
-      CACHE_VERSION: 0
+      CACHE_VERSION: 1
       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' # use scripts/update_qt_version.bash to change
+  QT_VERSION: '6.6.0' # 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' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # 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/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
     runs-on: ubuntu-latest
     env:
-      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # 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' # use scripts/update_qt_version.bash to change
+  QT_VERSION: '6.6.0' # 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-20231110-162
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 0
+  CACHE_VERSION: 1
 
 concurrency:
   group: ci-${{github.ref}}-ios
@@ -146,7 +146,7 @@ jobs:
         uses: pat-s/always-upload-cache@v3.0.11
         with:
           path: ${{ github.workspace }}/Qt
-          key: ${{ runner.os }}-QtCache-v2-${{ env.QT_VERSION }}-ios
+          key: ${{ runner.os }}-QtCache-v3-${{ env.QT_VERSION }}-ios
 
       - name: Install Qt
         if: steps.cache-qt.outputs.cache-hit != 'true'

.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' # use scripts/update_qt_version.bash to change
-  CACHE_VERSION: 0
+  INPUT_SDK_VERSION: x64-linux-20231110-169
+  QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+  CACHE_VERSION: 1
 
 concurrency:
   group: ci-${{github.ref}}-linux

.github/workflows/macos.yml

@@ -16,8 +16,8 @@ on:
       - published
 
 env:
-  QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
-  INPUT_SDK_VERSION: x64-osx-20230824-181
+  QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+  INPUT_SDK_VERSION: x64-osx-20231110-188
   CCACHE_DIR: /Users/runner/work/ccache
   CACHE_VERSION: 0
   XC_VERSION: ${{ '14.2' }}

.github/workflows/win.yml

@@ -25,10 +25,10 @@ jobs:
     runs-on: windows-2019
 
     env:
-      QT_VERSION: '6.5.2' # use scripts/update_qt_version.bash to change
-      INPUT_SDK_VERSION: x64-windows-20230824-209
+      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+      INPUT_SDK_VERSION: x64-windows-20231110-215
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
-      CACHE_VERSION: 0
+      CACHE_VERSION: 1
       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 "5")
 set(MM_VERSION_PATCH "0")
-set(QT_VERSION_DEFAULT "6.5.2")
+set(QT_VERSION_DEFAULT "6.6.0")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for
 # Qt6AndroidMacros.cmake

INSTALL.md

@@ -141,7 +141,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.6.0/gcc_64 \
      -DINPUT_SDK_PATH=~/input-sdk/x64-linux \
      -DQGIS_QUICK_DATA_PATH=~/input/app/android/assets/qgis-data \
      ..
@@ -296,8 +296,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.6.0/ios \
+    -DQT_HOST_PATH=/opt/Qt/6.6.0/macos \
     -DCMAKE_TOOLCHAIN_FILE:PATH="~/input-sdk/ios.toolchain.cmake" \
     -DCMAKE_INSTALL_PREFIX:PATH="../install" \
     -DUSE_SERVER_API_KEY=FALSE \
@@ -333,7 +333,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.6.0/macos \
   -DCMAKE_INSTALL_PREFIX:PATH=$BASE_DIR/install-macos \
   -DINPUT_SDK_PATH=$BASE_DIR/sdk/x64-osx \
   -GNinja \
@@ -361,7 +361,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.6.0\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
 ```

app/CMakeLists.txt

@@ -47,8 +47,8 @@ set(MM_SRCS
     appsettings.cpp
     autosynccontroller.cpp
     bluetoothdiscoverymodel.cpp
+    qrcodedecoder.cpp
     changelogmodel.cpp
-    codescanner.cpp
     compass.cpp
     featurelayerpair.cpp
     featuresmodel.cpp
@@ -69,7 +69,6 @@ set(MM_SRCS
     projectsmodel.cpp
     projectsproxymodel.cpp
     projectwizard.cpp
-    qrdecoder.cpp
     relationfeaturesmodel.cpp
     relationreferencefeaturesmodel.cpp
     scalebarkit.cpp
@@ -128,8 +127,8 @@ set(MM_HDRS
     appsettings.h
     autosynccontroller.h
     bluetoothdiscoverymodel.h
+    qrcodedecoder.h
     changelogmodel.h
-    codescanner.h
     compass.h
     enumhelper.h
     featurelayerpair.h
@@ -150,7 +149,6 @@ set(MM_HDRS
     projectsmodel.h
     projectsproxymodel.h
     projectwizard.h
-    qrdecoder.h
     relationfeaturesmodel.h
     relationreferencefeaturesmodel.h
     scalebarkit.h
@@ -546,7 +544,6 @@ add_subdirectory(qml)
 
 # register Singleton
 set_source_files_properties(qml/InputStyle.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
-set_source_files_properties(qml/MMCamera.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
 
 # make sure the QML files are not prefixed with "qml/" in the qmldir
 set(MM_QML_SRCS)