Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: If9fd98525b6b4ca07e5e006fc98bf372a73b8a21

1 files changed, 9 insertions, 0 deletions

diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc
index 1f3a73073f..2b7f9c5241 100644
--- a/src/corelib/tools/qvarlengtharray.qdoc
+++ b/src/corelib/tools/qvarlengtharray.qdoc
@@ -362,6 +362,15 @@
     Assigns \a other to this array and returns a reference to this array.
  */
 
+/*! \fn QVarLengthArray<T, Prealloc> &QVarLengthArray::operator=(std::initializer_list<T> list)
+    \since 5.5
+
+    Assigns the values of \a list to this array, and returns a reference to this array.
+
+    This constructor is only enabled if the compiler supports C++11 initializer
+    lists.
+*/
+
 /*! \fn QVarLengthArray::QVarLengthArray(const QVarLengthArray<T, Prealloc> &other)
     Constructs a copy of \a other.
  */