Use QOffscreenSurface instead of QWindow for dummy surfaces.

Android doesn't like creating extra QWindows, so changed
dummy surfaces used to do static initialization and cleanup
to use QOffscreenSurface.

Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index cfc691af..fc3b4a19 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -28,7 +28,7 @@
 #include "scatter3drenderer_p.h"
 
 #include <QtCore/qmath.h>
-#include <QtGui/QWindow>
+#include <QtGui/QOffscreenSurface>
 #include <QtCore/QThread>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -1789,8 +1789,7 @@ void Abstract3DRenderer::fixContextBeforeDelete()
     // Otherwise we expect it to be our shared context, so we can use it for cleanup.
     if (!QOpenGLContext::currentContext() && !m_context.isNull()
             && QThread::currentThread() == this->thread()) {
-        m_dummySurfaceAtDelete = new QWindow();
-        m_dummySurfaceAtDelete->setSurfaceType(QWindow::OpenGLSurface);
+        m_dummySurfaceAtDelete = new QOffscreenSurface();
         m_dummySurfaceAtDelete->setFormat(m_context->format());
         m_dummySurfaceAtDelete->create();