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, 17 insertions, 17 deletions

diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index 9a85c4aa..ae321b65 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -33,7 +33,7 @@
 #include <QtDataVisualization/qscatterdataproxy.h>
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QString>
-#include <QtCore/QRegExp>
+#include <QtCore/QRegularExpression>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -47,10 +47,10 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa
     Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY yPosRoleChanged)
     Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY zPosRoleChanged)
     Q_PROPERTY(QString rotationRole READ rotationRole WRITE setRotationRole NOTIFY rotationRoleChanged)
-    Q_PROPERTY(QRegExp xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegExp yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegExp zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegExp rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1)
     Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION 1)
     Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION 1)
     Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION 1)
@@ -83,14 +83,14 @@ public:
     void remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole,
                const QString &rotationRole);
 
-    void setXPosRolePattern(const QRegExp &pattern);
-    QRegExp xPosRolePattern() const;
-    void setYPosRolePattern(const QRegExp &pattern);
-    QRegExp yPosRolePattern() const;
-    void setZPosRolePattern(const QRegExp &pattern);
-    QRegExp zPosRolePattern() const;
-    void setRotationRolePattern(const QRegExp &pattern);
-    QRegExp rotationRolePattern() const;
+    void setXPosRolePattern(const QRegularExpression &pattern);
+    QRegularExpression xPosRolePattern() const;
+    void setYPosRolePattern(const QRegularExpression &pattern);
+    QRegularExpression yPosRolePattern() const;
+    void setZPosRolePattern(const QRegularExpression &pattern);
+    QRegularExpression zPosRolePattern() const;
+    void setRotationRolePattern(const QRegularExpression &pattern);
+    QRegularExpression rotationRolePattern() const;
 
     void setXPosRoleReplace(const QString &replace);
     QString xPosRoleReplace() const;
@@ -107,10 +107,10 @@ Q_SIGNALS:
     void yPosRoleChanged(const QString &role);
     void zPosRoleChanged(const QString &role);
     void rotationRoleChanged(const QString &role);
-    Q_REVISION(1) void xPosRolePatternChanged(const QRegExp &pattern);
-    Q_REVISION(1) void yPosRolePatternChanged(const QRegExp &pattern);
-    Q_REVISION(1) void zPosRolePatternChanged(const QRegExp &pattern);
-    Q_REVISION(1) void rotationRolePatternChanged(const QRegExp &pattern);
+    Q_REVISION(1) void xPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1) void yPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1) void zPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1) void rotationRolePatternChanged(const QRegularExpression &pattern);
     Q_REVISION(1) void rotationRoleReplaceChanged(const QString &replace);
     Q_REVISION(1) void xPosRoleReplaceChanged(const QString &replace);
     Q_REVISION(1) void yPosRoleReplaceChanged(const QString &replace);