diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-10-08 10:33:42 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-10-08 10:33:42 (GMT) |
| commit | e086a153c25d3bd5d58d72c34384d8452cb3b3be (patch) | |
| tree | 1ec8e8bfa3fc3a99b1285cc863e61ec65a97ee48 /src/corelib/tools | |
| parent | a780773292c3a59e1500f5e36c3de729a8f45f1c (diff) | |
| parent | 392ecc76cdbcef37ee492400a1b783106a37ad36 (diff) | |
| download | Qt-e086a153c25d3bd5d58d72c34384d8452cb3b3be.zip Qt-e086a153c25d3bd5d58d72c34384d8452cb3b3be.tar.gz Qt-e086a153c25d3bd5d58d72c34384d8452cb3b3be.tar.bz2 | |
Merge remote branch 'qt/master' into earth/file-engine-refactor
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index a0df065..7a26c4f 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -74,10 +74,6 @@ int qFindString(const QChar *haystack, int haystackLen, int from, #define RXERR_INTERVAL QT_TRANSLATE_NOOP("QRegExp", "invalid interval") #define RXERR_CATEGORY QT_TRANSLATE_NOOP("QRegExp", "invalid category") -/* - WARNING! Be sure to read qregexp.tex before modifying this file. -*/ - /*! \class QRegExp \reentrant diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b4c6f57..cfffc4a 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -577,7 +577,7 @@ const QString::Null QString::null = { }; and join a list of strings into a single string with an optional separator using QStringList::join(). You can obtain a list of strings from a string list that contain a particular substring or - that match a particular QRegExp using the QStringList::find() + that match a particular QRegExp using the QStringList::filter() function. : \section1 Querying String Data |