summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-30 14:00:43 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-30 14:51:11 +0200
commit2d61b8f27a74168ca06a32c4d2f077af2cbc7b88 (patch)
treec8b66e6bf32c53fbbe4bbd34c7e55206bc85d963 /src/datavisualization/utils
parent20d1d25119e67724ac8fcb0a69451cd8c1fb984c (diff)
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>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/utils.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 685e0707..15ef444c 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -21,7 +21,7 @@
#include <QtGui/QPainter>
#include <QtGui/QOpenGLContext>
-#include <QtGui/QWindow>
+#include <QtGui/QOffscreenSurface>
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -327,11 +327,10 @@ bool Utils::isOpenGLES()
void Utils::resolveStatics()
{
QOpenGLContext *ctx = QOpenGLContext::currentContext();
- QWindow *dummySurface = 0;
+ QOffscreenSurface *dummySurface = 0;
if (!ctx) {
QSurfaceFormat surfaceFormat = qDefaultSurfaceFormat();
- dummySurface = new QWindow();
- dummySurface->setSurfaceType(QWindow::OpenGLSurface);
+ dummySurface = new QOffscreenSurface();
dummySurface->setFormat(surfaceFormat);
dummySurface->create();
ctx = new QOpenGLContext;