Skip to content

Commit 9aa836c

Browse files
committed
Travis: try to guess qmake path
1 parent 44e23e8 commit 9aa836c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

buildScripts/travis/after_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ case $TRAVIS_OS_NAME in
77
TSNAME=trik-studio-installer-mac-$TRAVIS_BRANCH.dmg
88
;;
99
linux)
10-
QTIFWBIN=$(find /Qt/Tools/QtInstallerFramework/ -maxdepth 2 -name bin -type d -print0 | sort -Vrz | head -zn 1)
10+
QTIFWBIN=$($EXECUTOR bash -c 'find /Qt/Tools/QtInstallerFramework/ -maxdepth 2 -name bin -type d -print0 | sort -Vrz | head -zn 1')
1111
TSNAME=trik-studio-installer-linux-$TRAVIS_BRANCH.run
1212
;;
1313
*) exit 1 ;;
1414
esac
15-
QTBIN=${QTBIN:-$($EXECUTOR qmake -query QT_HOST_BINS)}
15+
QTBIN=${QTBIN:-$($EXECUTOR bash -c "make qmake -n | sed 's#/qmake.*\$##g'")}
1616
df -h .
1717

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

0 commit comments

Comments
 (0)