From 79f8b6281f96b8f9fafa7c2f7b16199fc9c5ec45 Mon Sep 17 00:00:00 2001
From: orbea <orbea@fredslev.dk>
Date: Fri, 18 Jan 2019 11:34:22 -0800
Subject: [PATCH] Revert "WIP: travis: Enable building qt for linux." (#8039)

---
 .travis.yml       | 31 +++++++++++++++++++------------
 qb/config.libs.sh |  3 +--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 99eeff4e0d..471b79871f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,18 +24,22 @@ matrix:
         - make
       env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: gcc
-      # Install a more recent gcc than the default
-      before_install:
-        - sudo apt-get install -y g++-7
-    - compiler: clang
-      # Install a more recent clang than the default
-      before_install:
-        - sudo apt-get install -y clang-3.8
       addons:
+        # Install a more recent gcc than the default
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+    - compiler: clang
+      addons:
+        # Install a more recent clang than the default
         apt:
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
       env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
     - os: osx
       osx_image: xcode8
@@ -61,20 +65,23 @@ script:
 env:
   global:
    - MAKEFLAGS="-j2"
-   - QT_SELECT=qt5
    - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
 addons:
   apt:
     packages:
+      - curl
+      - pkg-config
+      - libglu1-mesa-dev
+      - freeglut3-dev
+      - mesa-common-dev
       - libsdl1.2-dev
       - libsdl-image1.2-dev
       - libsdl-mixer1.2-dev
       - libsdl-ttf2.0-dev
       - libusb-1.0-0-dev
-      - qtbase5-dev
-      - qtdeclarative5-dev
-    sources:
-      - ubuntu-toolchain-r-test
+      - qt5-default
+      - qt5-qmake
+      - qtbase5-dev-tools
   coverity_scan:
     project:
       name: "RetroArch"
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 0ac1efde18..64668df0be 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -284,6 +284,7 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_CXX" != "no" ]; then
    check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2
    check_pkgconf QT5NETWORK Qt5Network 5.2
    #check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4
+   check_pkgconf OPENSSL openssl 1.0.0
 
    # pkg-config is needed to reliably find Qt5 libraries.
 
@@ -294,8 +295,6 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_CXX" != "no" ]; then
       HAVE_QT=yes
    fi
 
-   check_pkgconf OPENSSL openssl 1.0.0
-
    #if [ "$HAVE_QT5WEBENGINE" = "no" ]; then
    #   die : 'Notice: Qt5WebEngine not found, disabling web browser support.'
    #fi