diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/corelib/tools/qvarlengtharray.qdoc | |
parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/corelib/tools/qvarlengtharray.qdoc')
-rw-r--r-- | src/corelib/tools/qvarlengtharray.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc index 452bc0a598..0481373f2d 100644 --- a/src/corelib/tools/qvarlengtharray.qdoc +++ b/src/corelib/tools/qvarlengtharray.qdoc @@ -483,7 +483,7 @@ /*! \fn QVarLengthArray::iterator QVarLengthArray::begin() \since 4.8 - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa constBegin(), end() @@ -497,7 +497,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa begin(), cend() @@ -506,7 +506,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::constBegin() const \since 4.8 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa begin(), constEnd() @@ -515,7 +515,7 @@ /*! \fn QVarLengthArray::iterator QVarLengthArray::end() \since 4.8 - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa begin(), constEnd() @@ -530,7 +530,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa cbegin(), end() @@ -539,7 +539,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::constEnd() const \since 4.8 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa constBegin(), end() |