1 files changed, 52 insertions, 20 deletions

diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index 6b0b39c7bb..0d37b6ea58 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -191,20 +191,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QStringList::QStringList(const QStringList &other)
-
-    Constructs a copy of the \a other string list.
-
-    This operation takes \l{constant time} because QStringList is
-    \l{implicitly shared}, making the process of returning a
-    QStringList from a function very fast. If a shared instance is
-    modified, it will be copied (copy-on-write), and that takes
-    \l{linear time}.
-
-    \sa operator=()
-*/
-
-/*!
     \fn QStringList::QStringList(const QList<QString> &other)
 
     Constructs a copy of \a other.
@@ -218,6 +204,37 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \fn QStringList::QStringList(QList<QString> &&other)
+    \overload
+    \since 5.4
+
+    Move-constructs from QList<QString>.
+
+    After a successful construction, \a other will be empty.
+*/
+
+/*!
+    \fn QStringList &QStringList::operator=(const QList<QString> &other)
+    \since 5.4
+
+    Copy assignment operator from QList<QString>. Assigns the \a other
+    list of strings to this string list.
+
+    After the operation, \a other and \c *this will be equal.
+*/
+
+/*!
+    \fn QStringList &QStringList::operator=(QList<QString> &&other)
+    \overload
+    \since 5.4
+
+    Move assignment operator from QList<QString>. Moves the \a other
+    list of strings to this string list.
+
+    After the operation, \a other will be empty.
+*/
+
+/*!
     \fn void QStringList::sort(Qt::CaseSensitivity cs)
 
     Sorts the list of strings in ascending order.
@@ -235,9 +252,14 @@ QT_BEGIN_NAMESPACE
     integer index.
 */
 
-static inline bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
-{
-   return s1.compare(s2, Qt::CaseInsensitive) < 0;
+namespace {
+struct CaseInsensitiveLessThan {
+    typedef bool result_type;
+    result_type operator()(const QString &s1, const QString &s2) const
+    {
+        return s1.compare(s2, Qt::CaseInsensitive) < 0;
+    }
+};
 }
 
 void QtPrivate::QStringList_sort(QStringList *that, Qt::CaseSensitivity cs)
@@ -245,7 +267,7 @@ void QtPrivate::QStringList_sort(QStringList *that, Qt::CaseSensitivity cs)
     if (cs == Qt::CaseSensitive)
         std::sort(that->begin(), that->end());
     else
-        std::sort(that->begin(), that->end(), caseInsensitiveLessThan);
+        std::sort(that->begin(), that->end(), CaseInsensitiveLessThan());
 }
 
 
@@ -457,7 +479,7 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, i
     if (totalLength == 0)
         return res;
     res.reserve(totalLength);
-    for (int i = 0; i < that->size(); ++i) {
+    for (int i = 0; i < size; ++i) {
         if (i)
             res.append(sep, seplen);
         res += that->at(i);
@@ -492,6 +514,16 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, i
     the latter string list.
 */
 
+/*!
+    \fn QStringList &QStringList::operator<<(const QList<QString> &other)
+    \since 5.4
+
+    \overload
+
+    Appends the \a other string list to the string list and returns a reference to
+    the latter string list.
+*/
+
 #ifndef QT_NO_DATASTREAM
 /*!
     \fn QDataStream &operator>>(QDataStream &in, QStringList &list)
@@ -725,7 +757,7 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that)
             continue;
         seen.insert(s);
         if (j != i)
-            (*that)[j] = s;
+            that->swap(i, j);
         ++j;
     }
     if (n != j)