Add SVG support to AppImage, move files instead of copying

.circleci/config.yml

@@ -50,7 +50,7 @@ update_and_install_prereqs: &update_and_install_prereqs
     - run:
         name: Install QT packages
         command: |
-            apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2  qt512tools  qt512base qtchooser -y
+            apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base qtchooser -y
     - run:
         name: Install X11 packages
         command: apt-get install libx11-dev libxt-dev libxtst-dev -y
@@ -121,7 +121,8 @@ jobs:
             - run:
                 name: Install QT packages
                 command: |
-                    apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2  qt512tools  qt512base qtchooser -y
+                    apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base qtchooser -y
+            - run: ls -R /opt/qt512
             - run:
                 name: Install X11 packages
                 command: apt-get install libx11-dev libxt-dev libxtst-dev -y

build_scripts/linux/appimage.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 PROJECT_DIR=$SCRIPT_DIR/../../
 BUILD_DIR=$PROJECT_DIR/build/
@@ -19,23 +21,26 @@ mkdir -p $EXE_DIR/usr/share/icons/hicolor/256x256/apps
 # https://github.com/probonopd/linuxdeployqt/issues/25
 # linuxdeployqt fails to deploy QtQuick/Dialogs and QtQuick/LocalStorage
 mkdir -p $EXE_DIR/usr/qml/QtQuick/Dialogs
-cp -r /opt/qt512/qml/QtQuick/Dialogs $EXE_DIR/usr/qml/QtQuick
+cp -avr /opt/qt512/qml/QtQuick/Dialogs $EXE_DIR/usr/qml/QtQuick/
 
-cp $EXE_DIR/AdvancedSettings $EXE_DIR/usr/bin
+# https://github.com/probonopd/linuxdeployqt/issues/82
-cp -r $EXE_DIR/res $EXE_DIR/usr/bin
+# linuxdeployqt fails to deploy plugins/imageformats/libqsvg.so
-cp -r $EXE_DIR/default_action_manifests $EXE_DIR/usr/bin
+mkdir -p $EXE_DIR/usr/plugins/imageformats
-cp $EXE_DIR/action_manifest.json $EXE_DIR/usr/bin
+cp -av /opt/qt512/plugins/imageformats/libqsvg.so $EXE_DIR/usr/plugins/imageformats/libqsvg.so
-cp $EXE_DIR/libopenvr_api.so $EXE_DIR/usr/bin
+
-cp $EXE_DIR/manifest.vrmanifest $EXE_DIR/usr/bin
+mv $EXE_DIR/AdvancedSettings $EXE_DIR/usr/bin
+mv $EXE_DIR/res $EXE_DIR/usr/bin
+mv $EXE_DIR/default_action_manifests $EXE_DIR/usr/bin
+mv $EXE_DIR/action_manifest.json $EXE_DIR/usr/bin
+mv $EXE_DIR/libopenvr_api.so $EXE_DIR/usr/bin
+mv $EXE_DIR/manifest.vrmanifest $EXE_DIR/usr/bin
 
 cp $PROJECT_DIR/src/res/img/icons/thumbicon.png $EXE_DIR/usr/share/icons/hicolor/256x256/apps/AdvancedSettings.png
 
 cp $PROJECT_DIR/src/package_files/linux/AdvancedSettings.desktop $EXE_DIR/usr/share/applications/AdvancedSettings.desktop
 
-#cp ~/.steam/bin32/libsteam.o $EXE_DIR/usr/lib
-
 qmake --version
 
-$PROJECT_DIR/linuxdeployqt-continuous-x86_64.AppImage -version
+$PROJECT_DIR/linuxdeployqt-continuous-x86_64.AppImage -version --appimage-extract-and-run
 
 $PROJECT_DIR/linuxdeployqt-continuous-x86_64.AppImage $EXE_DIR/usr/share/applications/AdvancedSettings.desktop --appimage-extract-and-run -appimage -verbose=2 -always-overwrite -qmldir=$PROJECT_DIR/src/res/qml

docs/building_for_linux.md

@@ -42,7 +42,7 @@ After installing using the official installer you will likely need to `qtchooser
 
 If you don't want to use the offical installer, you can use [this](https://launchpad.net/~beineri) PPA.
 
-You will need at least `qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2  qt512tools  qt512base`, although if you have the drive space it's probably easier just to get `qt512-meta-full`.
+You will need at least `qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base`, although if you have the drive space it's probably easier just to get `qt512-meta-full`.
 
 For Ubuntu 16.04
 ```bash