Support QRegularExpression on the same level as QRegExp

QRegularExpression is the recommended way to do regular expressions
nowadays. Support assignment of JavaScript regular expressions to
QRegularExpression properties of QObjects and the other way around.
QJSValue::toVariant() will create a QRegularExpression from a JavaScript
RegExp by default now.

[ChangeLog][QtQml][Important Behavior Changes] QRegularExpression is now
supported the same way QRegExp is in QML. QJSValue::toVariant() creates
a QRegularExpression variant rather than a QRegExp one from a JavaScript
regular expression now.

Fixes: QTBUG-73429
Change-Id: I301a02771cd17903406c2bc5c7aaeca6cce629f0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 48cbf02751..b4349f79ca 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -2418,6 +2418,13 @@ void tst_qqmlecmascript::regExpBug()
         delete object;
     }
 
+    {
+        QQmlComponent component(&engine, testFileUrl("regularExpression.qml"));
+        QScopedPointer<MyQmlObject> object(qobject_cast<MyQmlObject*>(component.create()));
+        QVERIFY(!object.isNull());
+        QCOMPARE(object->regularExpression().pattern(), QLatin1String("[a-zA-z]"));
+    }
+
     //QTBUG-23068
     {
         QString err = QString(QLatin1String("%1:6 Invalid property assignment: regular expression expected; use /pattern/ syntax\n")).arg(testFileUrl("regExp.2.qml").toString());
@@ -2427,6 +2434,18 @@ void tst_qqmlecmascript::regExpBug()
         QVERIFY(!object);
         QCOMPARE(component.errorString(), err);
     }
+
+    {
+        const QString err = QString::fromLatin1("%1:6 Invalid property assignment: "
+                                                "regular expression expected; "
+                                                "use /pattern/ syntax\n")
+                                    .arg(testFileUrl("regularExpression.2.qml").toString());
+        QQmlComponent component(&engine, testFileUrl("regularExpression.2.qml"));
+        QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready");
+        MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+        QVERIFY(!object);
+        QCOMPARE(component.errorString(), err);
+    }
 }
 
 static inline bool evaluate_error(QV4::ExecutionEngine *v4, const QV4::Value &o, const char *source)