summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-21 01:30:43 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-21 02:59:14 +0200
commit642ebccaad1656420fc5a9b37c04bec02ec079b4 (patch)
treeeaabf10380ca37ecb8899bd1e146153c642b223e /src/corelib/tools
parent129a8ce3898091c7a6a84b9b0b68fa32b7ce61bd (diff)
parent8c6755aeec312ae771ef334fc863642514db3f7c (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qstring.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index ac7052f3a1..5f12141d2a 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -805,8 +805,7 @@ const QString::Null QString::null = { };
/*! \typedef QString::const_iterator
- The QString::const_iterator typedef provides an STL-style const
- iterator for QString.
+ This typedef provides an STL-style const iterator for QString.
\sa QString::iterator
*/
@@ -834,13 +833,12 @@ const QString::Null QString::null = { };
/*!
\typedef QString::const_reference
- The QString::const_reference typedef provides an STL-style
- const reference for a QString element (QChar).
+ This typedef provides an STL-style const reference for a QString element (QChar).
*/
/*!
\typedef QString::reference
- The QString::reference typedef provides an STL-style
+ This typedef provides an STL-style
reference for a QString element (QChar).
*/
@@ -860,8 +858,7 @@ const QString::Null QString::null = { };
/*!
\typedef QString::value_type
- The QString::const_reference typedef provides an STL-style
- value type for QString.
+ This typedef provides an STL-style value type for QString.
*/
/*! \fn QString::iterator QString::begin()