diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-09-20 16:44:03 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-09-21 06:18:23 +0000 |
| commit | 7e1d96ef9ca1ff2449d1d3c4b1eefb42234da7dd (patch) | |
| tree | ea560800fd55a61ab3aeca17b824c47fb9fe4d4f | |
| parent | aa8e21cc3f60e54dd9c5d1ec482ca440857568f0 (diff) | |
Use Material style only on devices with gpu
Task-number: QTBUG-70493
Change-Id: Ia768ad91ea0f5672b9c25a7ae4102d8d19de9570
Reviewed-by: Kari Hormi <kari.hormi@qt.io>
| -rw-r--r-- | basicsuite/shared/main.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index e682c67..c6aefc3 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -66,6 +66,7 @@ #include <QSettings> #include <QQuickStyle> #include <QIcon> +#include <QQuickWindow> #if defined(USE_QTWEBENGINE) #include <qtwebengineglobal.h> @@ -73,6 +74,13 @@ #include "engine.h" +static bool checkGlAvailability() +{ + QQuickWindow window; + return ((window.sceneGraphBackend() != "software") && + (window.sceneGraphBackend() != "softwarecontext")); +} + int main(int argc, char **argv) { //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); @@ -140,10 +148,15 @@ int main(int argc, char **argv) QGuiApplication::setFont(font); } + // Material style can be set only for devices supporting GL QSettings styleSettings; QString style = styleSettings.value("style").toString(); - if (style.isEmpty() || style == "Default") - styleSettings.setValue("style", "Material"); + if (checkGlAvailability()) { + if (style.isEmpty() || style == "Default") + styleSettings.setValue("style", "Material"); + } else { + qDebug()<<"No GL available, skipping Material style"; + } QQuickStyle::setStyle(styleSettings.value("style").toString()); DummyEngine engine; |