diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:18:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:18:05 +0200 |
| commit | 8ba6dec8b2adf79826d31ae00c048564025e86c3 (patch) | |
| tree | b1156ba35a8ca6549ce047a5c07420a2370b2936 /src | |
| parent | 78ff59c151879c01c34beb6c89204ef3e07f6fdc (diff) | |
| parent | 269b1d5699f6c95d46553e7ee547f1c4b7545e63 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I47f394d5e0963e8a70d705c39bfe8a31ed528bb4
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(); } |