travis: added appropriate linux dependencies

dustatron · Jan 20, 2020 · f4567a9 · f4567a9
1 parent 28d0aec
commit f4567a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -6,7 +6,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
-    sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
+    sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
     source /opt/qt*/bin/qt*-env.sh
 
 fi
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -31,7 +31,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
     # Generate Makefile
-    cmake . -DQt5LinguistTools_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5LinguistTools
+    cmake .
 
     # Make
     make -j$(nproc)
@@ -43,7 +43,7 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     fi
 
     # Use `make install` on `appdir` to place files in the correct place
-    make DESTDIR=appdir -j$(nproc) install
+    make DESTDIR=appdir install
 
     # Download linuxdeployqt
     wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"