From 471a6cbd07fddd3f392204d532ac8d3639c7dc7f Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Thu, 10 Dec 2020 07:12:10 +0200 Subject: Migrate C++ API rendering path to Qt 6 Replace QRegExp with QRegularExpression and change usage accordingly. Replace shared QOpenGLFunctions_2_1 with our own copy. Fix header include changes. Task-number: QTBUG-89297 Change-Id: I6d3cf36ba9303ef62db3220816ea35f51eb26a3c Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/abstract3drenderer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/datavisualization/engine/abstract3drenderer.cpp') diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index ef77dc92..fd81e930 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -132,7 +132,7 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) // Discard warnings about deprecated functions QtMessageHandler handler = qInstallMessageHandler(discardDebugMsgs); - m_funcs_2_1 = QOpenGLContext::currentContext()->versionFunctions(); + m_funcs_2_1 = new QOpenGLFunctions_2_1; if (m_funcs_2_1) m_funcs_2_1->initializeOpenGLFunctions(); @@ -192,6 +192,8 @@ Abstract3DRenderer::~Abstract3DRenderer() m_axisCacheX.clearLabels(); m_axisCacheY.clearLabels(); m_axisCacheZ.clearLabels(); + + delete m_funcs_2_1; } void Abstract3DRenderer::contextCleanup() -- cgit v1.2.3