diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-01-16 21:12:21 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 15:59:48 (GMT) |
| commit | 7ce3726aea4be2dfdb57966a4482f66fec6f8f57 (patch) | |
| tree | 32c0149772999b8bfd341ddb3fd9e71b4d09ca30 /src/corelib | |
| parent | 181456d0a31b7250da97eafba75e6bc657391777 (diff) | |
| download | Qt-7ce3726aea4be2dfdb57966a4482f66fec6f8f57.zip Qt-7ce3726aea4be2dfdb57966a4482f66fec6f8f57.tar.gz Qt-7ce3726aea4be2dfdb57966a4482f66fec6f8f57.tar.bz2 | |
Fix a couple of edge cases for WildcardUnix matching
Fix a couple of cases where WildcardUnix was not matching when the
string was just [] or ended with a \.
The testWildcardEscaping() test has been extended to account for these
two cases too.
Task-number: QTBUG-20897
Change-Id: I9ddb10f5a1150427e8ccefae0dc87a3d4e104854
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index ca2d07c..109ae94 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -772,7 +772,7 @@ static QString wc2rx(const QString &wc_str, const bool enableEscaping) if (isEscaping) { rx += QLatin1String("\\\\"); } // we insert the \\ later if necessary - if (i+1 == wclen) { // the end + if (i == wclen) { // the end rx += QLatin1String("\\\\"); } } else { |