Skip to content

Commit

Permalink
Merge pull request #341 from AdenKoperczak/update_qt_6_8_1
Browse files Browse the repository at this point in the history
Bump dependency Qt to 6.8.1
  • Loading branch information
dpaulat authored Jan 15, 2025
2 parents 6ef24bf + 8e2674f commit 3f5a005
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
compiler: msvc
msvc_arch: x64
msvc_version: 2022
qt_version: 6.8.0
qt_version: 6.8.1
qt_arch_aqt: win64_msvc2022_64
qt_arch_dir: msvc2022_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
Expand All @@ -42,7 +42,7 @@ jobs:
env_cc: gcc-11
env_cxx: g++-11
compiler: gcc
qt_version: 6.8.0
qt_version: 6.8.1
qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
Expand All @@ -57,7 +57,7 @@ jobs:
env_cc: clang-17
env_cxx: clang++-17
compiler: clang
qt_version: 6.8.0
qt_version: 6.8.1
qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build_type: Release
env_cc: clang-17
env_cxx: clang++-17
qt_version: 6.8.0
qt_version: 6.8.1
qt_arch_aqt: linux_gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: ''
Expand Down
2 changes: 1 addition & 1 deletion setup-debug.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ call tools\setup-common.bat
set build_dir=build-debug
set build_type=Debug
set conan_profile=scwx-win64_msvc2022
set qt_version=6.8.0
set qt_version=6.8.1
set qt_arch=msvc2022_64

conan config install tools/conan/profiles/%conan_profile% -tf profiles
Expand Down
2 changes: 1 addition & 1 deletion setup-debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
build_dir=${1:-build-debug}
build_type=Debug
conan_profile=${2:-scwx-linux_gcc-11}
qt_version=6.8.0
qt_version=6.8.1
qt_arch=gcc_64
script_dir="$(dirname "$(readlink -f "$0")")"

Expand Down
2 changes: 1 addition & 1 deletion setup-multi.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ call tools\setup-common.bat

set build_dir=build
set conan_profile=scwx-win64_msvc2022
set qt_version=6.8.0
set qt_version=6.8.1
set qt_arch=msvc2022_64

conan config install tools/conan/profiles/%conan_profile% -tf profiles
Expand Down
2 changes: 1 addition & 1 deletion setup-release.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ call tools\setup-common.bat
set build_dir=build-release
set build_type=Release
set conan_profile=scwx-win64_msvc2022
set qt_version=6.8.0
set qt_version=6.8.1
set qt_arch=msvc2022_64

conan config install tools/conan/profiles/%conan_profile% -tf profiles
Expand Down
2 changes: 1 addition & 1 deletion setup-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
build_dir=${1:-build-release}
build_type=Release
conan_profile=${2:-scwx-linux_gcc-11}
qt_version=6.8.0
qt_version=6.8.1
qt_arch=gcc_64
script_dir="$(dirname "$(readlink -f "$0")")"

Expand Down

0 comments on commit 3f5a005

Please sign in to comment.