diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 13:49:26 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 14:52:40 +0200 |
| commit | 8c6755aeec312ae771ef334fc863642514db3f7c (patch) | |
| tree | 3ccec405ee35690bdb7def6c0a3c42866bd9adc2 /src/corelib/tools | |
| parent | 104debb6627d71f5540bb2c3347ce56dddc63594 (diff) | |
| parent | c40a48af997f57caa0ecfca0b247837ba5b2f89b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b909e9e09b..548a4ca8cc 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() |