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

diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp
index eb984c1a..8f573ccb 100644
--- a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp
@@ -155,23 +155,23 @@ void tst_proxy::initialProperties()
     QCOMPARE(m_proxy->autoRowCategories(), true);
     QCOMPARE(m_proxy->columnCategories(), QStringList());
     QCOMPARE(m_proxy->columnRole(), QString());
-    QCOMPARE(m_proxy->columnRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->columnRolePattern(), QRegularExpression());
     QCOMPARE(m_proxy->columnRoleReplace(), QString());
     QVERIFY(!m_proxy->itemModel());
     QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelSurfaceDataProxy::MMBLast);
     QCOMPARE(m_proxy->rowCategories(), QStringList());
     QCOMPARE(m_proxy->rowRole(), QString());
-    QCOMPARE(m_proxy->rowRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->rowRolePattern(), QRegularExpression());
     QCOMPARE(m_proxy->rowRoleReplace(), QString());
     QCOMPARE(m_proxy->useModelCategories(), false);
     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->columnCount(), 0);
@@ -191,46 +191,46 @@ void tst_proxy::initializeProperties()
     m_proxy->setAutoRowCategories(false);
     m_proxy->setColumnCategories(QStringList() << "col1" << "col2");
     m_proxy->setColumnRole("column");
-    m_proxy->setColumnRolePattern(QRegExp("/^.*-(\\d\\d)$/"));
+    m_proxy->setColumnRolePattern(QRegularExpression("/^.*-(\\d\\d)$/"));
     m_proxy->setColumnRoleReplace("\\\\1");
     m_proxy->setItemModel(table.model());
     m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBAverage);
     m_proxy->setRowCategories(QStringList() << "row1" << "row2");
     m_proxy->setRowRole("row");
-    m_proxy->setRowRolePattern(QRegExp("/^(\\d\\d\\d\\d).*$/"));
+    m_proxy->setRowRolePattern(QRegularExpression("/^(\\d\\d\\d\\d).*$/"));
     m_proxy->setRowRoleReplace("\\\\1");
     m_proxy->setUseModelCategories(true);
     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");
 
     QCOMPARE(m_proxy->autoColumnCategories(), false);
     QCOMPARE(m_proxy->autoRowCategories(), false);
     QCOMPARE(m_proxy->columnCategories().count(), 2);
     QCOMPARE(m_proxy->columnRole(), QString("column"));
-    QCOMPARE(m_proxy->columnRolePattern(), QRegExp("/^.*-(\\d\\d)$/"));
+    QCOMPARE(m_proxy->columnRolePattern(), QRegularExpression("/^.*-(\\d\\d)$/"));
     QCOMPARE(m_proxy->columnRoleReplace(), QString("\\\\1"));
     QVERIFY(m_proxy->itemModel());
     QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelSurfaceDataProxy::MMBAverage);
     QCOMPARE(m_proxy->rowCategories().count(), 2);
     QCOMPARE(m_proxy->rowRole(), QString("row"));
-    QCOMPARE(m_proxy->rowRolePattern(), QRegExp("/^(\\d\\d\\d\\d).*$/"));
+    QCOMPARE(m_proxy->rowRolePattern(), QRegularExpression("/^(\\d\\d\\d\\d).*$/"));
     QCOMPARE(m_proxy->rowRoleReplace(), QString("\\\\1"));
     QCOMPARE(m_proxy->useModelCategories(), true);
     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"));
 }
 
@@ -264,11 +264,11 @@ void tst_proxy::multiMatch()
     m_proxy->setItemModel(table.model());
     m_proxy->setRowRole(table.model()->roleNames().value(Qt::DisplayRole));
     m_proxy->setColumnRole(table.model()->roleNames().value(Qt::DisplayRole));
-    m_proxy->setRowRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setRowRolePattern(QRegularExpression(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setRowRoleReplace(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->setColumnRolePattern(QRegExp(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setColumnRolePattern(QRegularExpression(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setColumnRoleReplace(QStringLiteral("\\1"));
 
     QSurface3DSeries *series = new QSurface3DSeries(m_proxy);