diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-14 11:56:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-14 13:45:18 +0200 |
| commit | b1a216649ec064412160638dd00195cd47c567aa (patch) | |
| tree | a4134415a3849cfb857942e698514be9da18924f /tests/auto/corelib/tools/qregexp/tst_qregexp.cpp | |
| parent | 2e20ae3c1b57169497f6f3904623be4f5e617e12 (diff) | |
| parent | 1632786f00875d23c7d111cbb29dedaa35c1c8c2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/unix/unixmake2.cpp
src/corelib/thread/qthread_unix.cpp
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408
Diffstat (limited to 'tests/auto/corelib/tools/qregexp/tst_qregexp.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qregexp/tst_qregexp.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp index a98d37d733..a8111af6c1 100644 --- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp +++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp @@ -834,6 +834,13 @@ void tst_QRegExp::testEscapingWildcard_data(){ QTest::newRow("a true '\\' in input") << "\\Qt;" << "\\Qt;" << true; QTest::newRow("two true '\\' in input") << "\\\\Qt;" << "\\\\Qt;" << true; QTest::newRow("a '\\' at the end") << "\\\\Qt;\\" << "\\\\Qt;\\" << true; + + QTest::newRow("[]\\] matches ]") << "[]\\]" << "]" << true; + QTest::newRow("[]\\] matches \\") << "[]\\]" << "\\" << true; + QTest::newRow("[]\\] does not match [") << "[]\\]" << "[" << false; + QTest::newRow("[]\\]a matches ]a") << "[]\\]a" << "]a" << true; + QTest::newRow("[]\\]a matches \\a") << "[]\\]a" << "\\a" << true; + QTest::newRow("[]\\]a does not match [a") << "[]\\]a" << "[a" << false; } void tst_QRegExp::testEscapingWildcard(){ |