Skip to content

Commit

Permalink
ci(macOS): Use Qt 6.5.1 for snapshot packages and builds
Browse files Browse the repository at this point in the history
  • Loading branch information
bugwelle committed Jun 8, 2023
1 parent f2cccae commit 55cdb92
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .ci/macOS/build_macOS_release_Qt6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ and builds a release binary of MediaElch for macOS for Qt6.
Uses hard-coded paths of the current maintainer.
You may need to adapt your \$PATH or macdeployqt may not be found.
export PATH="\$HOME/Qt/6.5.0/macos/bin/:\$PATH"
export PATH="\$HOME/Qt/6.5.1/macos/bin/:\$PATH"
Options
--no-confirm Build MediaElch without confirm dialog.
Expand Down Expand Up @@ -81,8 +81,8 @@ parse_params "$@"
export CXX=clang++
export CC=clang

print_important "Using Qt6 from \$HOME/Qt/6.5.0"
export PATH="$HOME/Qt/6.5.0/macos/bin/:$OLD_PATH"
print_important "Using Qt6 from \$HOME/Qt/6.5.1"
export PATH="$HOME/Qt/6.5.1/macos/bin/:$OLD_PATH"

# Check for macOS build and packaging dependencies
./.ci/macOS/check_macOS_dependencies.sh
Expand Down
6 changes: 3 additions & 3 deletions .ci/macOS/package_macOS_Qt6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ for our nightly builds.
Use .ci/macOS/build_macOS_release_Qt6.sh if you want to build MediaElch.
You may need to adapt your \$PATH or macdeployqt may not be found.
export PATH="\$HOME/Qt/6.5.0/macos/bin/:\$PATH"
export PATH="\$HOME/Qt/6.5.1/macos/bin/:\$PATH"
Options
--no-confirm Package MediaElch without confirm dialog.
Expand Down Expand Up @@ -85,8 +85,8 @@ parse_params "$@"
#######################################################
# Getting Details

print_important "Using Qt6 from \$HOME/Qt/6.5.0"
export PATH="$HOME/Qt/6.5.0/macos/bin/:$OLD_PATH"
print_important "Using Qt6 from \$HOME/Qt/6.5.1"
export PATH="$HOME/Qt/6.5.1/macos/bin/:$OLD_PATH"

# Check for macOS build and packaging dependencies
./.ci/macOS/check_macOS_dependencies.sh
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
a movie/TV show/concert is selected, then your MediaInfo version has a bug.
Please contact the maintainer of your system's `libmediainfo`.
See [here](https://github.com/MediaArea/MediaInfo/issues/707) for more.
- MediaElch for macOS 11 and later now uses Qt 6.5
- MediaElch for macOS 11 and later now uses Qt 6.5.1

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/guides/build-qt6-with-tsan.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ cd "${PROJECT_DIR:?}"
git clone git://code.qt.io/qt/qt5.git qt6
cd qt6
perl init-repository
git checkout v6.5.0
git checkout v6.5.1
cd ..
```

Expand Down

0 comments on commit 55cdb92

Please sign in to comment.