diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5049fbd..e3033807 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: ldflags: '' msvc_arch: x64 msvc_version: 2022 - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: win64_msvc2022_64 qt_arch_dir: msvc2022_64 qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport @@ -47,7 +47,7 @@ jobs: compiler: gcc cppflags: '' ldflags: '' - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: linux_gcc_64 qt_arch_dir: gcc_64 qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport @@ -65,7 +65,7 @@ jobs: compiler: clang cppflags: '' ldflags: '' - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: linux_gcc_64 qt_arch_dir: gcc_64 qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport @@ -83,7 +83,7 @@ jobs: compiler: gcc cppflags: '' ldflags: '' - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: linux_gcc_arm64 qt_arch_dir: gcc_arm64 qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport @@ -99,7 +99,7 @@ jobs: env_cc: clang env_cxx: clang++ compiler: clang - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: clang_64 qt_arch_dir: macos qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport @@ -114,7 +114,7 @@ jobs: env_cc: clang env_cxx: clang++ compiler: clang - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: clang_64 qt_arch_dir: macos qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport diff --git a/.github/workflows/clang-tidy-review.yml b/.github/workflows/clang-tidy-review.yml index 10059650..b3de8edf 100644 --- a/.github/workflows/clang-tidy-review.yml +++ b/.github/workflows/clang-tidy-review.yml @@ -20,7 +20,7 @@ jobs: build_type: Release env_cc: clang-18 env_cxx: clang++-18 - qt_version: 6.8.3 + qt_version: 6.9.2 qt_arch_aqt: linux_gcc_64 qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_tools: '' diff --git a/CMakePresets.json b/CMakePresets.json index 9fec9614..ec997016 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -54,7 +54,7 @@ "inherits": "windows-x64-base", "hidden": true, "cacheVariables": { - "CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/msvc2022_64" + "CMAKE_PREFIX_PATH": "C:/Qt/6.9.2/msvc2022_64" } }, { @@ -63,7 +63,7 @@ "hidden": true, "generator": "Ninja", "cacheVariables": { - "CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/msvc2022_64" + "CMAKE_PREFIX_PATH": "C:/Qt/6.9.2/msvc2022_64" } }, { @@ -71,7 +71,7 @@ "inherits": "linux-base", "hidden": true, "cacheVariables": { - "CMAKE_PREFIX_PATH": "/opt/Qt/6.8.3/gcc_64" + "CMAKE_PREFIX_PATH": "/opt/Qt/6.9.2/gcc_64" }, "environment": { "CC": "gcc-11", @@ -212,7 +212,7 @@ "displayName": "CI Linux GCC ARM64", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "CMAKE_PREFIX_PATH": "/opt/Qt/6.8.3/gcc_arm64", + "CMAKE_PREFIX_PATH": "/opt/Qt/6.9.2/gcc_arm64", "CONAN_HOST_PROFILE": "scwx-linux_gcc-11_armv8", "CONAN_BUILD_PROFILE": "scwx-linux_gcc-11_armv8" }, @@ -226,7 +226,7 @@ "inherits": "base", "hidden": true, "cacheVariables": { - "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.8.3/macos" + "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.9.2/macos" }, "condition": { "type": "equals", diff --git a/tools/lib/common-paths.bat b/tools/lib/common-paths.bat index 69f6c6fc..8cd0cb60 100644 --- a/tools/lib/common-paths.bat +++ b/tools/lib/common-paths.bat @@ -1 +1 @@ -@set qt_version=6.8.3 +@set qt_version=6.9.2 diff --git a/tools/lib/common-paths.sh b/tools/lib/common-paths.sh index a1f48932..aadbe417 100755 --- a/tools/lib/common-paths.sh +++ b/tools/lib/common-paths.sh @@ -1,2 +1,2 @@ #!/bin/bash -export qt_version=6.8.3 +export qt_version=6.9.2