Merge remote-tracking branch 'origin/5.11' into 5.12

* origin/5.11:

  ee06ee8 Use a smoother looping animation in loading indicator
  f8e7d81 media player: change default video
  b3cc14b Use Material style only on devices with gpu

Change-Id: I097552a1d935e527f786cc160a322441be3ea167

1 files changed, 7 insertions, 7 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index b30e75a..c29a61c 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -56,7 +56,7 @@ Engine::Engine(QQuickItem *parent)
     , m_intro_done(false)
     , m_apps_ready(false)
     , m_fps_enabled(false)
-    , m_glAvailable(true)
+    , m_glAvailable(checkForGlAvailability())
 {
     m_state = ENGINE_STATE_RUNNING;
 
@@ -74,13 +74,13 @@ Engine::Engine(QQuickItem *parent)
     m_screenHeight = m_screenSize.height();
 
     connect(this, SIGNAL(windowChanged(QQuickWindow*)), this, SLOT(windowChanged(QQuickWindow*)));
+}
 
-    //Check for software renderer
-    QString renderer = qgetenv("QMLSCENE_DEVICE");
-    if (renderer.toLower() == "softwarecontext") {
-        m_glAvailable = false;
-        emit glAvailableChanged(false);
-    }
+bool Engine::checkForGlAvailability()
+{
+    QQuickWindow window;
+    return ((window.sceneGraphBackend() != "software") &&
+            (window.sceneGraphBackend() != "softwarecontext"));
 }
 
 void Engine::updateReadyness()