Force software renderer to using ES2

Task-number: QTRD-3410
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 15ef444c..df74cbd3 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -329,7 +329,7 @@ void Utils::resolveStatics()
     QOpenGLContext *ctx = QOpenGLContext::currentContext();
     QOffscreenSurface *dummySurface = 0;
     if (!ctx) {
-        QSurfaceFormat surfaceFormat = qDefaultSurfaceFormat();
+        QSurfaceFormat surfaceFormat;
         dummySurface = new QOffscreenSurface();
         dummySurface->setFormat(surfaceFormat);
         dummySurface->create();
@@ -355,6 +355,12 @@ void Utils::resolveStatics()
         delete dummySurface;
     }
 
+    // We support only ES2 emulation with software renderer for now
+    if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) {
+        qWarning("Only OpenGL ES2 emulation is available for software rendering.");
+        isES = true;
+    }
+
     staticsResolved = true;
 }