From d57a9dee815c774ef809c6a1ed4c310b903ab0f3 Mon Sep 17 00:00:00 2001
From: Joe <rubberduckie3554@gmail.com>
Date: Sun, 24 Feb 2019 17:29:51 -0500
Subject: [PATCH] more ci updates

---
 .ci/install.sh | 9 +++++----
 .ci/script.sh  | 4 ----
 .travis.yml    | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index 56e5fb45..585526c1 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -38,11 +38,12 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     ./configure && make && make check && sudo make install
     popd
 
+    sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
     sudo apt-get update -qq
     sudo apt-get install -qq -y \
-        qtbase5-dev \
-        qttools5-dev \
-        libqt5svg5-dev \
-        qtmultimedia5-dev \
+        qt${QT_PKG}base \
+        qt${QT_PKG}tools \
+        qt${QT_PKG}svg \
+        qt${QT_PKG}multimedia \
         liblmdb-dev
 fi
\ No newline at end of file
diff --git a/.ci/script.sh b/.ci/script.sh
index 435f2c27..4f8101ef 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -13,10 +13,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}"
 fi
 
-if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
-fi
-
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
     export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
 fi
diff --git a/.travis.yml b/.travis.yml
index e52e7272..952e56c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: bionic
+dist: trusty
 
 notifications:
   webhooks: