summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-09-19 17:18:38 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-22 20:46:13 +0200
commite0b1eac3ff1abbf4f8d27d6b0bdfe0ebc1d12b7c (patch)
treeae33614fd513bce7cf8a206735b4a67264ddbfb0 /src
parent2480ebb50bc0aabb7f84d5856436acc282f98b11 (diff)
QStringList: adapt documentation to cover new join(QChar) overload
Change-Id: Ia73501e1e8a562cfab750d1796fb597cd89eab74 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/doc/snippets/qstringlist/main.cpp4
-rw-r--r--src/corelib/tools/qstringlist.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/doc/snippets/qstringlist/main.cpp b/src/corelib/doc/snippets/qstringlist/main.cpp
index 49b7651a92..3b1833d2b5 100644
--- a/src/corelib/doc/snippets/qstringlist/main.cpp
+++ b/src/corelib/doc/snippets/qstringlist/main.cpp
@@ -75,8 +75,8 @@ Widget::Widget(QWidget *parent)
//! [3]
//! [4]
- QString str = fonts.join(",");
- // str == "Arial,Helvetica,Times,Courier"
+ QString str = fonts.join(", ");
+ // str == "Arial, Helvetica, Times, Courier"
//! [4]
//! [5] //! [6]
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index 87215d2240..d56f531e52 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -136,6 +136,8 @@ QT_BEGIN_NAMESPACE
\snippet qstringlist/main.cpp 4
+ The argument to join can be a single character or a string.
+
To break up a string into a string list, use the QString::split()
function: