diff options
| author | Matthew Cattell <matthew.cattell@nokia.com> | 2011-09-13 11:09:31 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-14 10:13:39 +0200 |
| commit | 6824441666063f015e265f34f87a67c625898df5 (patch) | |
| tree | 5d39a6201ae09b078528c3f227525423a9b47afc /src | |
| parent | f902ecfe6a99aa733cb18b0c435825546f1d18d5 (diff) | |
Fixed failing test in QSGFocusScope.
added some waits and removed unnecessary lines from autotest
Change-Id: I847bde6db5222b12d0f0b88a8c323fd09aad9d7c
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/scenegraph/coreapi/qsgrenderer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp index b81df008f7..af118e0717 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp @@ -568,7 +568,10 @@ public: ~QSGRendererVBOGeometryData() { - QOpenGLFunctions *func = QOpenGLContext::currentContext()->functions(); + QOpenGLContext *ctx = QOpenGLContext::currentContext(); + if (!ctx) + return; + QOpenGLFunctions *func = ctx->functions(); if (vertexBuffer) func->glDeleteBuffers(1, &vertexBuffer); if (indexBuffer) |