Remove QRegExpValidator usages

This also means the RegExpValidator QML type will be gone. Use
QRegularExpressionValidator instead.

[ChangeLog][QtQuick][RegExpValidator] The RegExpValidator QML type has
been removed. Use RegularExpressionValidator instead.

Change-Id: If25fc5a258a669dfd28e705271757caa252ce05c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

5 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml b/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml
index b5af13cc4c..c0317f3583 100644
--- a/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml
+++ b/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.14
 
 TextInput {
     id: textinput
@@ -6,8 +6,8 @@ TextInput {
     height: 50
     width: 200
     text: "abc"
-    validator: RegExpValidator {
+    validator: RegularExpressionValidator {
         id: regexpvalidator
-        regExp: regexvalue
+        regularExpression: regexvalue
     }
 }
diff --git a/tests/auto/quick/qquicktextinput/data/signal_accepted.qml b/tests/auto/quick/qquicktextinput/data/signal_accepted.qml
index 94c113dd9f..4de4ace542 100644
--- a/tests/auto/quick/qquicktextinput/data/signal_accepted.qml
+++ b/tests/auto/quick/qquicktextinput/data/signal_accepted.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.2
+import QtQuick 2.14
 
 Item {
     property QtObject input: input
@@ -8,7 +8,7 @@ Item {
     Column{
         TextInput { id: input;
             property bool acceptable: acceptableInput
-            validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ }
+            validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ }
         }
     }
 }
diff --git a/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml b/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml
index dba186e765..7784417569 100644
--- a/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml
+++ b/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.2
+import QtQuick 2.14
 
 Item {
     property QtObject input1: input1
@@ -9,11 +9,11 @@ Item {
     Column{
         TextInput { id: input1;
             property bool acceptable: acceptableInput
-            validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ }
+            validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ }
         }
         TextInput { id: input2;
             property bool acceptable: acceptableInput
-            validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ }
+            validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ }
         }
     }
 }
diff --git a/tests/auto/quick/qquicktextinput/data/validators.qml b/tests/auto/quick/qquicktextinput/data/validators.qml
index b923f69801..b1eb5bf9ea 100644
--- a/tests/auto/quick/qquicktextinput/data/validators.qml
+++ b/tests/auto/quick/qquicktextinput/data/validators.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.14
 
 Item {
     property variant intInput: intInput
@@ -19,7 +19,7 @@ Item {
         }
         TextInput { id: strInput;
             property bool acceptable: acceptableInput
-            validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ }
+            validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ }
         }
         TextInput { id: unvalidatedInput
             property bool acceptable: acceptableInput
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 2e64c80b85..18b7903eeb 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -6008,7 +6008,7 @@ void tst_qquicktextinput::QTBUG_19956_regexp()
 {
     QUrl url = testFileUrl("qtbug-19956regexp.qml");
 
-    QString warning = url.toString() + ":11:9: Unable to assign [undefined] to QRegExp";
+    QString warning = url.toString() + ":11:9: Unable to assign [undefined] to QRegularExpression";
     QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
 
     QQuickView window(url);
@@ -6187,9 +6187,9 @@ void tst_qquicktextinput::keypress_inputMask_withValidator()
     QFETCH(QString, expectedText);
     QFETCH(QString, expectedDisplayText);
 
-    QString componentStr = "import QtQuick 2.0\nTextInput { focus: true; inputMask: \"" + mask + "\"\n";
+    QString componentStr = "import QtQuick 2.14\nTextInput { focus: true; inputMask: \"" + mask + "\"\n";
     if (!validatorRegExp.isEmpty())
-        componentStr += "validator: RegExpValidator { regExp: " + validatorRegExp + " }\n}";
+        componentStr += "validator: RegularExpressionValidator { regularExpression: " + validatorRegExp + " }\n}";
     else if (decimals > 0)
         componentStr += QString("validator: DoubleValidator { bottom: %1; decimals: %2; top: %3 }\n}").
                             arg(validatorMinimum).arg(decimals).arg(validatorMaximum);