Skip to content

Commit 39f4157

Browse files
committed
travis-ci update to qt6 for macOS
1 parent 6d4dce7 commit 39f4157

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/ci/osx/after_success.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [ "$(git rev-list -n 1 $VERSION)" != "$(git rev-parse HEAD)" ]; then
1717
exit 0
1818
fi
1919

20-
QTDIR="/usr/local/opt/qt5"
20+
QTDIR="/usr/local/opt/qt6"
2121
APP=Moolticute
2222
# this directory name will also be shown in the title when the DMG is mounted
2323
TEMPDIR=build/$APP
@@ -53,8 +53,8 @@ fi
5353

5454
#Call fix to change all rpath
5555
wget_retry https://raw.githubusercontent.com/mooltipass/macdeployqtfix/master/macdeployqtfix.py
56-
python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticute /usr/local/Cellar/qt5/5.*/
57-
python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticuted /usr/local/Cellar/qt5/5.*/
56+
python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticute /usr/local/Cellar/qt6/6.*/
57+
python macdeployqtfix.py build/$APP.app/Contents/MacOS/moolticuted /usr/local/Cellar/qt6/6.*/
5858

5959
#setup keychain
6060
KEYCHAIN="travis.keychain"

scripts/ci/osx/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ echo "install.sh"
55

66
brew update > /dev/null
77
brew upgrade wget
8-
brew install qt5 jq lftp
8+
brew install qt6 jq lftp
99
networksetup -setv6off Ethernet

scripts/ci/osx/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source $SCRIPTDIR/../funcs.sh
77
mkdir build
88
pushd build
99

10-
QTDIR="/usr/local/opt/qt5"
10+
QTDIR="/usr/local/opt/qt6"
1111
PATH="$QTDIR/bin:$PATH"
1212
LDFLAGS=-L$QTDIR/lib
1313
CPPFLAGS=-I$QTDIR/include

0 commit comments

Comments
 (0)