Merge pull request #8678 from patrickelectric/fix_style

Fix Qt environment style in linux systems

Merge pull request #8678 from patrickelectric/fix_style
Fix Qt environment style in linux systems
7fcf4ca5 · Don Gagne · GitHub · f4c967df · 75fb7106 · 7fcf4ca5
Unverified Commit 7fcf4ca5 authored May 02, 2020 by Don Gagne Committed by GitHub May 02, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

qgroundcontrol.pro qgroundcontrol.pro +1 -0

QGCApplication.cc src/QGCApplication.cc +6 -0

No files found.
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -250,6 +250,7 @@ QT += \
    positioning \
    qml \
    quick \
+    quickcontrols2 \
    quickwidgets \
    sql \
    svg \

--- 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>
@@ -219,6 +220,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