diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2020-12-10 07:12:10 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2020-12-14 06:57:52 +0200 |
| commit | 471a6cbd07fddd3f392204d532ac8d3639c7dc7f (patch) | |
| tree | cd4aa8b6cda0bb52e851d7ced1a3a93b8a8fa622 /src/datavisualization/engine | |
| parent | 058eab02a5c1d8d8de8917d473eb39aa18a1c888 (diff) | |
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 <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/datavisualization/engine')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 4 |
2 files changed, 5 insertions, 3 deletions
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<QOpenGLFunctions_2_1>(); + 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() diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index affd0d69..4155a551 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -42,7 +42,7 @@ #include <QtGui/QOpenGLFunctions> #if !defined(QT_OPENGL_ES_2) -# include <QtGui/QOpenGLFunctions_2_1> +# include <QtOpenGL/QOpenGLFunctions_2_1> #endif #include "datavisualizationglobal_p.h" #include "abstract3dcontroller_p.h" @@ -334,7 +334,7 @@ protected: QLocale m_locale; #if !defined(QT_OPENGL_ES_2) - QOpenGLFunctions_2_1 *m_funcs_2_1; // Not owned + QOpenGLFunctions_2_1 *m_funcs_2_1; #endif QPointer<QOpenGLContext> m_context; // Not owned bool m_isOpenGLES; |