From 471a6cbd07fddd3f392204d532ac8d3639c7dc7f Mon Sep 17 00:00:00 2001
From: Tomi Korpipaa <tomi.korpipaa@qt.io>
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 <miikka.heikkinen@qt.io>
---
 src/datavisualization/utils/texturehelper_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/datavisualization/utils/texturehelper_p.h')

diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index fac32a42..9ef68d74 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -45,7 +45,7 @@
 #include <QtGui/QLinearGradient>
 #if !defined(QT_OPENGL_ES_2)
 // 3D Textures are not supported by ES set
-#  include <QtGui/QOpenGLFunctions_2_1>
+#  include <QtOpenGL/QOpenGLFunctions_2_1>
 #endif
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -78,7 +78,7 @@ class TextureHelper : protected QOpenGLFunctions
     QRgb qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture_format);
 
 #if !defined(QT_OPENGL_ES_2)
-    QOpenGLFunctions_2_1 *m_openGlFunctions_2_1; // Not owned
+    QOpenGLFunctions_2_1 *m_openGlFunctions_2_1;
 #endif
     friend class Bars3DRenderer;
     friend class Surface3DRenderer;
-- 
cgit v1.2.3