diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-09 00:58:23 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-09 00:58:23 (GMT) |
| commit | a4ffe2d274cae2510d72d04f67b42f9448282fbd (patch) | |
| tree | 73bc2d655e4f9d449ff51671ecd50f76a929374c /src/corelib/tools/qregexp.cpp | |
| parent | 7a5cc73816df5cf65e8a9aaafd750acdac9ca5a3 (diff) | |
| parent | 86354a3896b92b110e5d28cbf894c23ed837f11e (diff) | |
| download | Qt-a4ffe2d274cae2510d72d04f67b42f9448282fbd.zip Qt-a4ffe2d274cae2510d72d04f67b42f9448282fbd.tar.gz Qt-a4ffe2d274cae2510d72d04f67b42f9448282fbd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 20ad444..eb104a8 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -523,7 +523,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, \endtable In the mode Wildcard, the wildcard characters cannot be - escaped. In the mode WildcardUnix, the character '\' escapes the + escaped. In the mode WildcardUnix, the character '\\' escapes the wildcard. For example if we are in wildcard mode and have strings which @@ -3779,7 +3779,7 @@ static void invalidateEngine(QRegExpPrivate *priv) \value WildcardUnix This is similar to Wildcard but with the behavior of a Unix shell. The wildcard characters can be escaped - with the character "\". + with the character "\\". \value FixedString The pattern is a fixed string. This is equivalent to using the RegExp pattern on a string in |