travis: further build attempt

mcallegari · Mar 6, 2018 · 378e473 · 378e473
1 parent d3646d9
commit 378e473
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -13,6 +13,6 @@ $QMAKE CONFIG+=coverage QMAKE_CXX=$CXX QMAKE_CC=$CC QMAKE_LINK=$CXX QMAKE_LINK_S
 exit $?
 fi
 if [ "$TASK" = "appimage" ]; then
-$QMAKE QMAKE_CXX="$CXX" QMAKE_CC="$CC" QMAKE_LINK="$CXX" QMAKE_LINK_SHLIB="$CXX" CONFIG+=appimage CONFIG+=qmlui && make
+$QMAKE CONFIG+=appimage CONFIG+=qmlui QMAKE_CXX=$CXX QMAKE_CC=$CC QMAKE_LINK=$CXX QMAKE_LINK_SHLIB=$CXX && make
 exit $?
 fi
diff --git a/.travis.yml b/.travis.yml
@@ -86,8 +86,8 @@ cache:
 
 before_install:
  - if [ "$QT" = "qt4" ]; then export QMAKE=qmake; fi
- - if [ "$TASK" = "compile" ] && [ "$QT" = "qt5" ]; then export QMAKE=/opt/qt56/bin/qmake; fi
- - if [ "$TASK" = "appimage" ]; then export QMAKE=/opt/qt59/bin/qmake; fi
+ - if [ "$QT" = "qt5" ]; then export QMAKE=/opt/qt56/bin/qmake; fi
+ - if [ "$QT" = "qt5qml" ]; then export QMAKE=/opt/qt59/bin/qmake; fi
  - if [ "$TASK" = "coverage" ]; then gem install coveralls-lcov; fi
 #Report the qmake version
  - $QMAKE -v