aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-03-18 16:49:13 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2020-03-19 17:26:06 +0100
commite13c5b753a1c579b28e8b0af950a3972d4475a92 (patch)
tree6b0566ad29bcd8ad0310b2bfbdce8b152edf3b44 /tests/auto
parenta73d89590cbab1a3e6b56d7e9e44a1898c95ed19 (diff)
Remove the remaining usages of QRegExp and QRegExpValidator
Change-Id: Iab8e682eeb43b3403eba37f7decb7f7a494ae361 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/controls/data/tst_combobox.qml12
-rw-r--r--tests/auto/controls/data/tst_spinbox.qml6
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 2d5069b3..abdb0a29 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick 2.14
import QtQuick.Window 2.2
import QtTest 1.0
import QtQuick.Controls 2.12
@@ -354,9 +354,9 @@ TestCase {
{ tag: "bananas (MatchExactly)", term: "bananas", flags: Qt.MatchExactly, index: -1 },
{ tag: "Cocomuffin (MatchExactly)", term: "Cocomuffin", flags: Qt.MatchExactly, index: 4 },
- { tag: "b(an)+a (MatchRegExp)", term: "B(an)+a", flags: Qt.MatchRegExp, index: 0 },
- { tag: "b(an)+a (MatchRegExp|MatchCaseSensitive)", term: "b(an)+a", flags: Qt.MatchRegExp | Qt.MatchCaseSensitive, index: 1 },
- { tag: "[coc]+\\w+ (MatchRegExp)", term: "[coc]+\\w+", flags: Qt.MatchRegExp, index: 2 },
+ { tag: "b(an)+a (MatchRegularExpression)", term: "B(an)+a", flags: Qt.MatchRegularExpression, index: 0 },
+ { tag: "b(an)+a (MatchRegularExpression|MatchCaseSensitive)", term: "b(an)+a", flags: Qt.MatchRegularExpression | Qt.MatchCaseSensitive, index: 1 },
+ { tag: "[coc]+\\w+ (MatchRegularExpression)", term: "[coc]+\\w+", flags: Qt.MatchRegularExpression, index: 2 },
{ tag: "?pp* (MatchWildcard)", term: "?pp*", flags: Qt.MatchWildcard, index: 3 },
{ tag: "app* (MatchWildcard|MatchCaseSensitive)", term: "app*", flags: Qt.MatchWildcard | Qt.MatchCaseSensitive, index: -1 },
@@ -1408,9 +1408,9 @@ TestCase {
}
}
- RegExpValidator {
+ RegularExpressionValidator {
id: regExpValidator
- regExp: /(red|blue|green)?/
+ regularExpression: /(red|blue|green)?/
}
function test_validator() {
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 22dbb352..a5c40cd3 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick 2.14
import QtTest 1.0
import QtQuick.Controls 2.12
import QtQuick.Window 2.12
@@ -623,8 +623,8 @@ TestCase {
property var items: ["Small", "Medium", "Large"]
- validator: RegExpValidator {
- regExp: new RegExp("(Small|Medium|Large)", "i")
+ validator: RegularExpressionValidator {
+ regularExpression: new RegExp("(Small|Medium|Large)", "i")
}
textFromValue: function(value) {