From 1c2ab59cacfaa7a7ae846b86fb30df0f92f7a5dc Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Sat, 2 Jun 2018 21:33:53 -0400
Subject: [PATCH 1/2] Add missing libraries to Linux build Add test for an
 existing window before attempting to close it.

---
 QGCSetup.pri                |  2 ++
 src/ui/MainWindowHybrid.qml | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/QGCSetup.pri b/QGCSetup.pri
index a032af3..49e5508 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -110,9 +110,11 @@ LinuxBuild {
         libQt5Gui.so.5 \
         libQt5Location.so.5 \
         libQt5Multimedia.so.5 \
+        libQt5MultimediaQuick.so.5 \
         libQt5Network.so.5 \
         libQt5OpenGL.so.5 \
         libQt5Positioning.so.5 \
+        libQt5PositioningQuick.so.5 \
         libQt5PrintSupport.so.5 \
         libQt5Qml.so.5 \
         libQt5Quick.so.5 \
diff --git a/src/ui/MainWindowHybrid.qml b/src/ui/MainWindowHybrid.qml
index 408ea37..a320d90 100644
--- a/src/ui/MainWindowHybrid.qml
+++ b/src/ui/MainWindowHybrid.qml
@@ -22,11 +22,19 @@ Item {
     }
 
     function attemptWindowClose() {
-        mainWindowInner.item.attemptWindowClose()
+        if(!mainWindowInner.item) {
+            controller.reallyClose()
+        } else {
+            mainWindowInner.item.attemptWindowClose()
+        }
     }
 
     function showMessage(message) {
-        mainWindowInner.item.showMessage(message)
+        if(mainWindowInner.item) {
+            mainWindowInner.item.showMessage(message)
+        } else {
+            console.log(message)
+        }
     }
 
     Loader {

From 2f4da96fa7aef2aa2a104d5a04808be576f337d1 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Sat, 2 Jun 2018 22:02:19 -0400
Subject: [PATCH 2/2] Disable cruncher for Android builds as it sucks and
 crashes half the time.

---
 android/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/build.gradle b/android/build.gradle
index a681443..dbe2618 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -54,6 +54,10 @@ android {
        }
     }
 
+    aaptOptions {
+        cruncherEnabled = false
+    }
+
     lintOptions {
         abortOnError false
     }