From 7d51b985a6b78098d5f712feb3d3e282fac7d7f4 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sun, 8 Sep 2019 23:47:19 +0200 Subject: [PATCH] Sorting the qmake path --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24da5d717..3c1387a38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ before_install: sudo apt-get -qq update && sudo apt-get -qq install g++-4.8 && sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev && - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90; + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 && + export QMAKE="qmake -qt=qt5"; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && @@ -27,6 +28,7 @@ before_install: brew install qt5 && brew install ant && pwd && + export QMAKE="/usr/local/opt/qt5/bin/qmake -qt=qt5" && ls; fi @@ -37,10 +39,6 @@ before_install: export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma; fi -# Building for Qt here - - if [ "$BUILD_Qt" == "YES" ]; then - export QMAKE="qmake -qt=qt5"; - fi # Building for Android here - if [ "$BUILD_ANDROID" == "YES" ]; then export ANDROID="android-sdk-linux/tools/android" &&