Fix Linux dependencies and remove Qt 5.7 builds again

Author: Frederick Thomssen

.travis.yml

@@ -6,33 +6,16 @@ matrix:
     # Workaround to prevent building in an empty environment
     - compiler: clang
   include:
-    ####################### Linux #######################
-    - os: linux
-      dist: trusty
-      sudo: required
-      env:
-        - qtenv: /opt/qt58/bin/qt58-env.sh
-        - qtpkg: "'qt58base qt58quickcontrols qt58quickcontrols2 qt58svg qt58x11extras mesa-common-dev libgl1-mesa-dev'"
-        - qtppa: ppa:beineri/opt-qt58-trusty
-        - qtver: 58
-    - os: linux
-      dist: trusty
-      sudo: required
-      env:
-        - qtenv: /opt/qt57/bin/qt57-env.sh
-        - qtpkg: "'qt57base qt57quickcontrols qt57quickcontrols2 qt57svg qt57x11extras mesa-common-dev libgl1-mesa-dev'"
-        - qtppa: ppa:beineri/opt-qt571-trusty
-        - qtver: 57
     ####################### macOS #######################
     ###
-    ### OS X 10.10
+    ### macOS 10.12
     ###
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode8.3
       env:
-        - dist: "osx"
-        - distver: "10.10"
-        - distname: "yosemite"
+        - dist: "macos"
+        - distver: "10.12"
+        - distname: "sierra"
     ###
     ### OS X 10.11
     ###
@@ -43,14 +26,23 @@ matrix:
         - distver: "10.11"
         - distname: "el-capitan"
     ###
-    ### macOS 10.12
+    ### OS X 10.10
     ###
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode6.4
       env:
-        - dist: "macos"
-        - distver: "10.12"
-        - distname: "sierra"
+        - dist: "osx"
+        - distver: "10.10"
+        - distname: "yosemite"
+    ####################### Linux #######################
+    - os: linux
+      dist: trusty
+      sudo: required
+      env:
+        - qtenv: /opt/qt58/bin/qt58-env.sh
+        - qtpkg: "'qt58base qt58quickcontrols qt58quickcontrols2 qt58svg qt58x11extras mesa-common-dev libgl1-mesa-dev'"
+        - qtppa: ppa:beineri/opt-qt58-trusty
+        - qtver: 58
 
 services:
   - docker

appveyor.yml

@@ -4,8 +4,6 @@ environment:
   matrix:
   - QTVER: 58
     QTDIR: C:\Qt\5.8\mingw53_32
-  - QTVER: 57
-    QTDIR: C:\Qt\5.7\mingw53_32
 
 install:
   - cd %APPVEYOR_BUILD_FOLDER%

deploy/deploy.linux.sh

@@ -29,11 +29,17 @@ cp cli/redtimercli dist/opt/redtimer
 cp gui/icons/clock_red.svg dist/opt/redtimer/redtimer.svg
 cp deploy/redtimer.desktop dist/opt/redtimer
 
+# Include things possibly missing from linuxdeployqt
+mkdir -p dist/opt/redtimer/lib
+cp -a $QTDIR/lib/$(readlink $QTDIR/lib/libQt5Svg.so.5) dist/opt/redtimer/lib/libQt5Svg.so.5
+mkdir -p dist/opt/redtimer/plugins
+cp -a $QTDIR/plugins/xcbglintegrations dist/opt/redtimer/plugins
+
 # Create AppImage
 deploy/linuxdeployqt dist/opt/redtimer/redtimercli -qmldir=gui/qml -verbose=2
 deploy/linuxdeployqt dist/opt/redtimer/redtimer -qmldir=gui/qml -appimage -bundle-non-qt-libs -verbose=2
 
-mv dist/opt/redtimer.AppImage $PREFIX.AppImage
+mv RedTimer-x86_64.AppImage $PREFIX.AppImage
 
 ##################### DEB/RPM creation #####################
 

deploy/linuxdeployqt

@@ -1 +1 @@
-linuxdeployqt-3-x86_64.AppImage
+linuxdeployqt-continuous-x86_64.AppImage