diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:46:49 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:48:41 +0200 |
commit | bc317e1ea56c85a41413a5ddde4112623a1b4913 (patch) | |
tree | e51b2b78f81940cfc70b49953308197080cd368f /src/datavisualization/engine/abstract3drenderer.cpp | |
parent | 03cbebd97354b7251e87dcde8adc6b49eba973e5 (diff) | |
parent | 46ef32d424d7e0209e52528286e31f656c654289 (diff) |
Merge branch 'develop'
Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer.cpp')
-rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 5 |
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(); |