Skip to content

Q
qgroundcontrol
Unverified Commit 7fcf4ca5 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8678 from patrickelectric/fix_style 

Fix Qt environment style in linux systems
parents f4c967df 75fb7106
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
qgroundcontrol.pro
View file @ 7fcf4ca5
...@@ -250,6 +250,7 @@ QT += \ ...@@ -250,6 +250,7 @@ QT += \
positioning \ positioning \
qml \ qml \
quick \ quick \
quickcontrols2 \
quickwidgets \ quickwidgets \
sql \ sql \
svg \ svg \
......
src/QGCApplication.cc
View file @ 7fcf4ca5
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <QFontDatabase> #include <QFontDatabase>
#include <QQuickWindow> #include <QQuickWindow>
#include <QQuickImageProvider> #include <QQuickImageProvider>
#include <QQuickStyle>
#ifdef QGC_ENABLE_BLUETOOTH #ifdef QGC_ENABLE_BLUETOOTH
#include <QBluetoothLocalDevice> #include <QBluetoothLocalDevice>
...@@ -219,6 +220,11 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -219,6 +220,11 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
} }
permFile.close(); permFile.close();
} }
// Set default QtQuick style if not configured
if (QString(getenv("QT_QUICK_CONTROLS_STYLE")).isEmpty()) {
QQuickStyle::setStyle("Universal");
}
} }
#endif #endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment