Browse Source

Merge pull request #8678 from patrickelectric/fix_style

Fix Qt environment style in linux systems
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
7fcf4ca544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      qgroundcontrol.pro
  2. 6
      src/QGCApplication.cc

1
qgroundcontrol.pro

@ -250,6 +250,7 @@ QT += \ @@ -250,6 +250,7 @@ QT += \
positioning \
qml \
quick \
quickcontrols2 \
quickwidgets \
sql \
svg \

6
src/QGCApplication.cc

@ -28,6 +28,7 @@ @@ -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) @@ -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

Loading…
Cancel
Save