diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-05-30 13:53:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-03 10:34:29 +0200 |
| commit | 31f0e3aa00f80ba4a0f4a06cf2ca4121b86f41b7 (patch) | |
| tree | d7053f9523b4cd816133106d1f8f3b347f0a72cd /src/quick | |
| parent | 9474bab37dc030ebf2f9fcd582fd6b4f2193c813 (diff) | |
Fix QQuickWidget cleanup and invalidation sequence
Make sure the context/surface are still alive and current while destroying
the render control.
Task-number: QTBUG-39034
Change-Id: I6ff0069985a9121a63025bfb165493b3f003391d
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp index e2a26836cf..87a60b5cce 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -120,13 +120,13 @@ void QQuickRenderControl::initialize(QOpenGLContext *gl) // surface belonging to window. In fact window may not have a native // window/surface at all. - QQuickWindowPrivate::get(d->window)->context->initialize(gl); + d->rc->initialize(gl); } void QQuickRenderControl::invalidate() { Q_D(QQuickRenderControl); - QQuickWindowPrivate::get(d->window)->context->invalidate(); + d->rc->invalidate(); } /*! |