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

diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp
index 55fb2333..6d0d7ed5 100644
--- a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp
@@ -109,16 +109,16 @@ void tst_proxy::initialProperties()
 
     QVERIFY(!m_proxy->itemModel());
     QCOMPARE(m_proxy->rotationRole(), QString());
-    QCOMPARE(m_proxy->rotationRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->rotationRolePattern(), QRegularExpression());
     QCOMPARE(m_proxy->rotationRoleReplace(), QString());
     QCOMPARE(m_proxy->xPosRole(), QString());
-    QCOMPARE(m_proxy->xPosRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->xPosRolePattern(), QRegularExpression());
     QCOMPARE(m_proxy->xPosRoleReplace(), QString());
     QCOMPARE(m_proxy->yPosRole(), QString());
-    QCOMPARE(m_proxy->yPosRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->yPosRolePattern(), QRegularExpression());
     QCOMPARE(m_proxy->yPosRoleReplace(), QString());
     QCOMPARE(m_proxy->zPosRole(), QString());
-    QCOMPARE(m_proxy->zPosRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->zPosRolePattern(), QRegularExpression());
     QCOMPARE(m_proxy->zPosRoleReplace(), QString());
 
     QCOMPARE(m_proxy->itemCount(), 0);
@@ -135,30 +135,30 @@ void tst_proxy::initializeProperties()
 
     m_proxy->setItemModel(table.model());
     m_proxy->setRotationRole("rotation");
-    m_proxy->setRotationRolePattern(QRegExp("/-/"));
+    m_proxy->setRotationRolePattern(QRegularExpression("/-/"));
     m_proxy->setRotationRoleReplace("\\\\1");
     m_proxy->setXPosRole("X");
-    m_proxy->setXPosRolePattern(QRegExp("/-/"));
+    m_proxy->setXPosRolePattern(QRegularExpression("/-/"));
     m_proxy->setXPosRoleReplace("\\\\1");
     m_proxy->setYPosRole("Y");
-    m_proxy->setYPosRolePattern(QRegExp("/-/"));
+    m_proxy->setYPosRolePattern(QRegularExpression("/-/"));
     m_proxy->setYPosRoleReplace("\\\\1");
     m_proxy->setZPosRole("Z");
-    m_proxy->setZPosRolePattern(QRegExp("/-/"));
+    m_proxy->setZPosRolePattern(QRegularExpression("/-/"));
     m_proxy->setZPosRoleReplace("\\\\1");
 
     QVERIFY(m_proxy->itemModel());
     QCOMPARE(m_proxy->rotationRole(), QString("rotation"));
-    QCOMPARE(m_proxy->rotationRolePattern(), QRegExp("/-/"));
+    QCOMPARE(m_proxy->rotationRolePattern(), QRegularExpression("/-/"));
     QCOMPARE(m_proxy->rotationRoleReplace(), QString("\\\\1"));
     QCOMPARE(m_proxy->xPosRole(), QString("X"));
-    QCOMPARE(m_proxy->xPosRolePattern(), QRegExp("/-/"));
+    QCOMPARE(m_proxy->xPosRolePattern(), QRegularExpression("/-/"));
     QCOMPARE(m_proxy->xPosRoleReplace(), QString("\\\\1"));
     QCOMPARE(m_proxy->yPosRole(), QString("Y"));
-    QCOMPARE(m_proxy->yPosRolePattern(), QRegExp("/-/"));
+    QCOMPARE(m_proxy->yPosRolePattern(), QRegularExpression("/-/"));
     QCOMPARE(m_proxy->yPosRoleReplace(), QString("\\\\1"));
     QCOMPARE(m_proxy->zPosRole(), QString("Z"));
-    QCOMPARE(m_proxy->zPosRolePattern(), QRegExp("/-/"));
+    QCOMPARE(m_proxy->zPosRolePattern(), QRegularExpression("/-/"));
     QCOMPARE(m_proxy->zPosRoleReplace(), QString("\\\\1"));
 }
 
@@ -184,11 +184,11 @@ void tst_proxy::addModel()
     m_proxy->setItemModel(table.model());
     m_proxy->setXPosRole(table.model()->roleNames().value(Qt::DisplayRole));
     m_proxy->setZPosRole(table.model()->roleNames().value(Qt::DisplayRole));
-    m_proxy->setXPosRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setXPosRolePattern(QRegularExpression(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setXPosRoleReplace(QStringLiteral("\\2"));
-    m_proxy->setYPosRolePattern(QRegExp(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setYPosRolePattern(QRegularExpression(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setYPosRoleReplace(QStringLiteral("\\3"));
-    m_proxy->setZPosRolePattern(QRegExp(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setZPosRolePattern(QRegularExpression(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setZPosRoleReplace(QStringLiteral("\\1"));
 
     QScatter3DSeries *series = new QScatter3DSeries(m_proxy);