diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:13:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:13:24 +0200 |
| commit | 269b1d5699f6c95d46553e7ee547f1c4b7545e63 (patch) | |
| tree | d756fea879ca8fe17c1485080a727cc7a02c02e8 /src | |
| parent | 82f5d3ad66eba012e2a18ebf4d143756526e8636 (diff) | |
| parent | 95884805facd1721eea025467afd85ed64a70504 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9c6f6ae4cfc72fc350fffc2ff1edf113d783a8f6
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/qtcanvas3d/renderjob.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/qtcanvas3d/renderjob.cpp b/src/imports/qtcanvas3d/renderjob.cpp index 3522546..78be04f 100644 --- a/src/imports/qtcanvas3d/renderjob.cpp +++ b/src/imports/qtcanvas3d/renderjob.cpp @@ -85,7 +85,9 @@ void CanvasRenderJob::run() QSurface *oldSurface(0); if (!m_renderer->usingQtContext()) { oldContext = QOpenGLContext::currentContext(); - oldSurface = oldContext->surface(); + if (oldContext) + oldSurface = oldContext->surface(); + m_renderer->makeCanvasContextCurrent(); } |