1 files changed, 19 insertions, 6 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 9e4ba70908..6e0634ac3b 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -45,6 +45,7 @@
 #include <QtCore/qalgorithms.h>
 #include <QtCore/qiterator.h>
 #include <QtCore/qrefcount.h>
+#include <QtCore/qarraydata.h>
 
 #include <iterator>
 #include <list>
@@ -69,6 +70,9 @@ QT_BEGIN_NAMESPACE
 template <typename T> class QVector;
 template <typename T> class QSet;
 
+template <typename T> struct QListSpecialMethods { };
+template <> struct QListSpecialMethods<QByteArray>;
+
 struct Q_CORE_EXPORT QListData {
     struct Data {
         QtPrivate::RefCount ref;
@@ -101,7 +105,7 @@ struct Q_CORE_EXPORT QListData {
 };
 
 template <typename T>
-class QList
+class QList : public QListSpecialMethods<T>
 {
     struct Node { void *v;
 #if defined(Q_CC_BOR)
@@ -129,7 +133,7 @@ public:
 #ifdef Q_COMPILER_INITIALIZER_LISTS
     inline QList(std::initializer_list<T> args)
         : d(const_cast<QListData::Data *>(&QListData::shared_null))
-    { std::copy(args.begin(), args.end(), std::back_inserter(*this)); }
+    { reserve(int(args.size())); std::copy(args.begin(), args.end(), std::back_inserter(*this)); }
 #endif
     bool operator==(const QList<T> &l) const;
     inline bool operator!=(const QList<T> &l) const { return !(*this == l); }
@@ -646,10 +650,17 @@ inline void QList<T>::move(int from, int to)
 template<typename T>
 Q_OUTOFLINE_TEMPLATE QList<T> QList<T>::mid(int pos, int alength) const
 {
-    if (alength < 0 || pos > size() - alength)
-        alength = size() - pos;
-    if (pos == 0 && alength == size())
+    using namespace QtPrivate;
+    switch (QContainerImplHelper::mid(size(), &pos, &alength)) {
+    case QContainerImplHelper::Null:
+    case QContainerImplHelper::Empty:
+        return QList<T>();
+    case QContainerImplHelper::Full:
         return *this;
+    case QContainerImplHelper::Subset:
+        break;
+    }
+
     QList<T> cpy;
     if (alength <= 0)
         return cpy;
@@ -737,7 +748,7 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::detach_helper()
 
 template <typename T>
 Q_OUTOFLINE_TEMPLATE QList<T>::QList(const QList<T> &l)
-    : d(l.d)
+    : QListSpecialMethods<T>(l), d(l.d)
 {
     if (!d->ref.ref()) {
         p.detach(d->alloc);
@@ -944,6 +955,8 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List)
 
 QT_END_NAMESPACE
 
+#include <QtCore/qbytearraylist.h>
+
 #ifdef Q_CC_MSVC
 #pragma warning( pop )
 #endif