diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-04-29 12:50:14 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-04-29 12:58:36 +0000 |
| commit | e4cd15e388f675a80a9c257655a580b1b53c240a (patch) | |
| tree | 07840b4acf5790a88dfe56740e5a4cab9ec8bf03 /src/datavisualization/engine/abstract3drenderer_p.h | |
| parent | fd902c04b912deb81f41da0cd216d2cb1c86289b (diff) | |
Fix hanging at application exit
Task-number: QTBUG-75256
Task-number: QTBUG-69627
Change-Id: If4221c8fcf783daf4bf6a38dbf1b9633a20eafb0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer_p.h')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index c312b771..d6ffb03c 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -191,6 +191,7 @@ Q_SIGNALS: protected: Abstract3DRenderer(Abstract3DController *controller); + virtual void contextCleanup(); virtual void initializeOpenGL(); void reInitShaders(); @@ -242,9 +243,6 @@ protected: void queriedGraphPosition(const QMatrix4x4 &projectionViewMatrix, const QVector3D &scaling, GLuint defaultFboHandle); - void fixContextBeforeDelete(); - void restoreContextAfterDelete(); - bool m_hasNegativeValues; Q3DTheme *m_cachedTheme; Drawer *m_drawer; @@ -339,7 +337,6 @@ protected: QOpenGLFunctions_2_1 *m_funcs_2_1; // Not owned #endif QPointer<QOpenGLContext> m_context; // Not owned - QOffscreenSurface *m_dummySurfaceAtDelete; bool m_isOpenGLES; private: |