diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-03-14 15:15:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 15:45:45 +0100 |
| commit | 3f362cdf9304afeed06081cd5abfcaf6aaabe19e (patch) | |
| tree | 2ce6cee541379fba587f17da3b309060099099a1 /src/quick/designer | |
| parent | d37b770a353079d1e8e34b5f59d4cd132fbd04e2 (diff) | |
Fix potential crash during shutdown for QQuickWindows
The cleanup() function would deregister the render loop from all
windows the render loop had seen, but the render loop doesn't see
windows until the window gets a showEvent and for some implementations
it was removed as a result of hideEvent. So add explicit tracking to
QSGRenderLoop which is managed by QQuickWindow's constructor and
destructor. With this, we no longer need the lists from the
subclasses, so these functions are removed again.
Change-Id: I05e5507ad57e23c80bacd99752654cc7d0890dc1
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/quick/designer')
| -rw-r--r-- | src/quick/designer/designerwindowmanager_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/designer/designerwindowmanager_p.h b/src/quick/designer/designerwindowmanager_p.h index 17a227d212..7414f4e3ba 100644 --- a/src/quick/designer/designerwindowmanager_p.h +++ b/src/quick/designer/designerwindowmanager_p.h @@ -93,8 +93,6 @@ public: QSGContext *sceneGraphContext() const; QSGRenderContext *createRenderContext(QSGContext *) const { return m_renderContext.data(); } - QList<QQuickWindow *> windows() const { return QList<QQuickWindow *>(); }; - static void createOpenGLContext(QQuickWindow *window); private: |