Skip to content

Commit e57050e

Browse files
committed
Travis: detect QTBIN from qmake
1 parent d5871e1 commit e57050e

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

buildScripts/travis/after_script.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@ set -euxo pipefail
33
$EXECUTOR env CCACHE_CONFIGPATH="$CCACHE_CONFIGPATH" ccache -s
44
case $TRAVIS_OS_NAME in
55
osx)
6-
QTBIN=/usr/local/opt/qt/bin
76
QTIFWBIN=/usr/local/bin
87
TSNAME=trik-studio-installer-mac-$TRAVIS_BRANCH.dmg
98
;;
109
linux)
11-
QTBIN=/Qt/5.12.3/gcc_64/bin
1210
QTIFWBIN=/Qt/Tools/QtInstallerFramework/3.0/bin
1311
TSNAME=trik-studio-installer-linux-$TRAVIS_BRANCH.run
1412
;;
1513
*) exit 1 ;;
1614
esac
17-
15+
QTBIN=${QTBIN:-$(qmake -query QT_HOST_BINS)}
1816
df -h .
1917

2018
if $INSTALLER && ! $TIMEOUT && [ "$TRAVIS_REPO_SLUG" == "trikset/trik-studio" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]

0 commit comments

Comments
 (0)