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>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h
index a4eefbcd..7b9b691a 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h
@@ -74,10 +74,10 @@ private:
     bool m_autoRowCategories;
     bool m_autoColumnCategories;
 
-    QRegExp m_rowRolePattern;
-    QRegExp m_columnRolePattern;
-    QRegExp m_valueRolePattern;
-    QRegExp m_rotationRolePattern;
+    QRegularExpression m_rowRolePattern;
+    QRegularExpression m_columnRolePattern;
+    QRegularExpression m_valueRolePattern;
+    QRegularExpression m_rotationRolePattern;
 
     QString m_rowRoleReplace;
     QString m_columnRoleReplace;