Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Iaab37b633a8286c2c21425aaac34d30529a3ea82

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc
index d0bb251e81..4c7cb32aac 100644
--- a/src/corelib/doc/src/containers.qdoc
+++ b/src/corelib/doc/src/containers.qdoc
@@ -123,6 +123,10 @@
     a vector can be quite slow, because it can lead to large numbers
     of items having to be moved by one position in memory.
 
+    \row \li \l{QVarLengthArray}<T, Prealloc>
+    \li This provides a low-level variable-length array. It can be used
+    instead of QVector in places where speed is particularly important.
+
     \row \li \l{QStack}<T>
     \li This is a convenience subclass of QVector that provides
     "last in, first out" (LIFO) semantics. It adds the following
@@ -622,15 +626,11 @@
 
     \section1 Other Container-Like Classes
 
-    Qt includes three template classes that resemble containers in
+    Qt includes other template classes that resemble containers in
     some respects. These classes don't provide iterators and cannot
     be used with the \c foreach keyword.
 
     \list
-    \li QVarLengthArray<T, Prealloc> provides a low-level
-       variable-length array. It can be used instead of QVector in
-       places where speed is particularly important.
-
     \li QCache<Key, T> provides a cache to store objects of a certain
        type T associated with keys of type Key.