summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.cpp
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-10-07 22:00:16 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-10-07 22:00:16 (GMT)
commit8130fcbffe365c0e019f45baae7f1b273d8e17e7 (patch)
tree91cebf29af4336d2010fe66460d586f605a72ab0 /src/corelib/tools/qstring.cpp
parent0f9d642e105da1644f4ed846a696510f9a9f1daf (diff)
parent161f15e1e79ec5f23244da68340ba1e78f3ac4bb (diff)
downloadQt-8130fcbffe365c0e019f45baae7f1b273d8e17e7.zip
Qt-8130fcbffe365c0e019f45baae7f1b273d8e17e7.tar.gz
Qt-8130fcbffe365c0e019f45baae7f1b273d8e17e7.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
-rw-r--r--src/corelib/tools/qstring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index ff9d877..d8dab43 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -565,7 +565,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