Merge remote-tracking branch 'gerrit/master' into containers

Conflicts:
	src/corelib/tools/qstring.cpp

Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb

diff --cc src/corelib/tools/qbytearray.cpp
Simple merge

diff --cc src/corelib/tools/qbytearray.h
Simple merge

diff --cc src/corelib/tools/qhash.cpp
Simple merge

diff --cc src/corelib/tools/qhash.h
Simple merge

diff --cc src/corelib/tools/qlinkedlist.cpp
Simple merge

diff --cc src/corelib/tools/qlinkedlist.h
Simple merge

diff --cc src/corelib/tools/qlist.cpp
Simple merge

diff --cc src/corelib/tools/qlist.h
Simple merge

diff --cc src/corelib/tools/qmap.cpp
Simple merge

diff --cc src/corelib/tools/qmap.h
Simple merge

diff --cc src/corelib/tools/qrefcount.h
Simple merge

diff --cc src/corelib/tools/qstring.cpp
index 8e49106,524096b..28e8b6b
--- 1/src/corelib/tools/qstring.cpp
--- 2/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@@ -1560,8 -1562,8 +1562,8 @@@ QString &QString::append(const QLatin1S
  {
      const uchar *s = (const uchar *)str.latin1();
      if (s) {
-         int len = qstrlen((char *)s);
+         int len = str.size();
 -        if (d->ref != 1 || d->size + len > int(d->alloc))
 +        if (d->ref.isShared() || d->size + len > int(d->alloc))
              realloc(grow(d->size + len));
          ushort *i = d->data() + d->size;
          while ((*i++ = *s++))

diff --cc src/corelib/tools/qstring.h
index 42fe85e,f1bad5c..a857d2d
--- 1/src/corelib/tools/qstring.h
--- 2/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@@ -706,12 -706,12 +706,12 @@@ inline QChar *QString::data(
  inline const QChar *QString::constData() const
  { return reinterpret_cast<const QChar*>(d->data()); }
  inline void QString::detach()
 -{ if (d->ref != 1 || d->offset) realloc(); }
 +{ if (d->ref.isShared() || d->offset) realloc(); }
  inline bool QString::isDetached() const
 -{ return d->ref == 1; }
 +{ return !d->ref.isShared(); }
  inline QString &QString::operator=(const QLatin1String &s)
  {
-     *this = fromLatin1(s.latin1());
+     *this = fromLatin1(s.latin1(), s.size());
      return *this;
  }
  inline void QString::clear()

diff --cc src/corelib/tools/qstringbuilder.h
Simple merge

diff --cc src/corelib/tools/qvector.cpp
Simple merge

diff --cc src/corelib/tools/qvector.h
Simple merge

diff --cc src/corelib/tools/tools.pri
Simple merge

diff --cc tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
Simple merge

diff --cc tests/auto/corelib/tools/qstring/tst_qstring.cpp
Simple merge

diff --cc tests/auto/corelib/tools/qvector/tst_qvector.cpp
Simple merge

diff --cc tests/benchmarks/corelib/tools/qvector/qrawvector.h
Simple merge