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>

2 files changed, 41 insertions, 0 deletions

diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
index b58cd98d1e..21ebf6b10b 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
@@ -1027,6 +1027,20 @@ void tst_QJSValue::toVariant()
         QJSValue rxObject = eng.toScriptValue(rx);
         QVERIFY(rxObject.isRegExp());
         QVariant var = rxObject.toVariant();
+
+        // We can't roundtrip a QRegExp this way, as toVariant() has no information on whether we
+        // want QRegExp or QRegularExpression. It will always create a QRegularExpression.
+        QCOMPARE(var.type(), QMetaType::QRegularExpression);
+        QRegularExpression result = var.toRegularExpression();
+        QCOMPARE(result.pattern(), rx.pattern());
+        QCOMPARE(result.patternOptions() & QRegularExpression::CaseInsensitiveOption, 0);
+    }
+
+    {
+        QRegularExpression rx = QRegularExpression("[0-9a-z]+");
+        QJSValue rxObject = eng.toScriptValue(rx);
+        QVERIFY(rxObject.isRegExp());
+        QVariant var = rxObject.toVariant();
         QCOMPARE(var, QVariant(rx));
     }
 
@@ -1194,6 +1208,32 @@ void tst_QJSValue::toRegExp()
     QVERIFY(qjsvalue_cast<QRegExp>(eng.toScriptValue(QVariant())).isEmpty());
 }
 
+void tst_QJSValue::toRegularExpression()
+{
+    QJSEngine eng;
+    {
+        QRegularExpression rx = qjsvalue_cast<QRegularExpression>(eng.evaluate("/foo/"));
+        QVERIFY(rx.isValid());
+        QCOMPARE(rx.pattern(), QString::fromLatin1("foo"));
+        QVERIFY(!(rx.patternOptions() & QRegularExpression::CaseInsensitiveOption));
+    }
+    {
+        QRegularExpression rx = qjsvalue_cast<QRegularExpression>(eng.evaluate("/bar/gi"));
+        QVERIFY(rx.isValid());
+        QCOMPARE(rx.pattern(), QString::fromLatin1("bar"));
+        QVERIFY(rx.patternOptions() & QRegularExpression::CaseInsensitiveOption);
+    }
+
+    QVERIFY(qjsvalue_cast<QRegularExpression>(eng.evaluate("[]")).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(eng.evaluate("{}")).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(eng.globalObject()).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(QJSValue()).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(QJSValue(123)).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(QJSValue(false)).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(eng.evaluate("null")).pattern().isEmpty());
+    QVERIFY(qjsvalue_cast<QRegularExpression>(eng.toScriptValue(QVariant())).pattern().isEmpty());
+}
+
 void tst_QJSValue::isArray_data()
 {
     newEngine();
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.h b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
index b8b9f4403c..9532b1f10e 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.h
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
@@ -76,6 +76,7 @@ private slots:
     void toQObject();
     void toDateTime();
     void toRegExp();
+    void toRegularExpression();
     void isArray_data();
     void isArray();
     void isDate();