Update lancelot test: NO_RHI and DirectGL path are gone

Change-Id: I93fa9dcf4879d30a260d0b28ac599a1c61c225f7
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 5 insertions, 8 deletions

diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
index dfb4b47a3b..4def908ffa 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
+++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
@@ -107,20 +107,17 @@ void tst_Scenegraph::initTestCase()
     const QString backend = qEnvironmentVariable(backendVarName, QString::fromLatin1("default"));
     QBaselineTest::addClientProperty(QString::fromLatin1(backendVarName), backend);
 
+    QString stack = backend;
+    if (stack != QLatin1String("software")) {
 #if defined(Q_OS_WIN)
-    const char *defaultRhiBackend = "d3d11";
+        const char *defaultRhiBackend = "d3d11";
 #elif defined(Q_OS_DARWIN)
-    const char *defaultRhiBackend = "metal";
+        const char *defaultRhiBackend = "metal";
 #else
-    const char *defaultRhiBackend = "opengl";
+        const char *defaultRhiBackend = "opengl";
 #endif
-    usingRhi = !qEnvironmentVariableIsSet("QSG_NO_RHI");
-    QString stack;
-    if (usingRhi) {
         const QString rhiBackend = qEnvironmentVariable("QSG_RHI_BACKEND", QString::fromLatin1(defaultRhiBackend));
         stack = QString::fromLatin1("RHI_%1").arg(rhiBackend);
-    } else {
-        stack = qEnvironmentVariable("QT_QUICK_BACKEND", QString::fromLatin1("DirectGL"));
     }
     QBaselineTest::addClientProperty(QString::fromLatin1("GraphicsStack"), stack);