From 0f8165a0d48d17f9d5adfc88b41cc27015717b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 15:27:20 -0300
Subject: [PATCH 1/2] qgroundcontrol: Add missing include of quickcontrols2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 qgroundcontrol.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index e88fd7e..d81dc71 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -250,6 +250,7 @@ QT += \
     positioning \
     qml \
     quick \
+    quickcontrols2 \
     quickwidgets \
     sql \
     svg \

From 75fb7106dfb0be55d27e76523ea1950a298a425d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 15:28:42 -0300
Subject: [PATCH 2/2] QGCApplication: fix missing QT_QUICK_CONTROLS_STYLE in
 linux systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 src/QGCApplication.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 50481d9..5871d73 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -28,6 +28,7 @@
 #include <QFontDatabase>
 #include <QQuickWindow>
 #include <QQuickImageProvider>
+#include <QQuickStyle>
 
 #ifdef QGC_ENABLE_BLUETOOTH
 #include <QBluetoothLocalDevice>
@@ -218,6 +219,11 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
             }
             permFile.close();
         }
+
+        // Set default QtQuick style if not configured
+        if (QString(getenv("QT_QUICK_CONTROLS_STYLE")).isEmpty()) {
+            QQuickStyle::setStyle("Universal");
+        }
     }
 #endif
 #endif