Merge branch 'stable' into dev

Conflicts:
	examples/widgets/painting/shared/shared.pri
	src/corelib/tools/qharfbuzz_p.h
	src/corelib/tools/qunicodetools.cpp
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp

Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3

19 files changed, 115 insertions, 85 deletions

diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index feda8f441d..3685a8938a 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -3585,7 +3585,8 @@ QByteArray QByteArray::toBase64() const
 
     Sets the byte array to the printed value of \a n in base \a base (10
     by default) and returns a reference to the byte array. The \a base can
-    be any value between 2 and 36.
+    be any value between 2 and 36. For bases other than 10, n is treated
+    as an unsigned integer.
 
     Example:
     \snippet code/src_corelib_tools_qbytearray.cpp 40
@@ -3623,7 +3624,7 @@ QByteArray QByteArray::toBase64() const
     \sa toLongLong()
 */
 
-QByteArray &QByteArray::setNum(qlonglong n, int base)
+static char *qulltoa2(char *p, qulonglong n, int base)
 {
 #if defined(QT_CHECK_RANGE)
     if (base < 2 || base > 36) {
@@ -3631,8 +3632,31 @@ QByteArray &QByteArray::setNum(qlonglong n, int base)
         base = 10;
     }
 #endif
-    QLocale locale(QLocale::C);
-    *this = locale.d->longLongToString(n, -1, base).toLatin1();
+    const char b = 'a' - 10;
+    do {
+        const int c = n % base;
+        n /= base;
+        *--p = c + (c < 10 ? '0' : b);
+    } while (n);
+
+    return p;
+}
+
+QByteArray &QByteArray::setNum(qlonglong n, int base)
+{
+    const int buffsize = 66; // big enough for MAX_ULLONG in base 2
+    char buff[buffsize];
+    char *p;
+
+    if (n < 0 && base == 10) {
+        p = qulltoa2(buff + buffsize, qulonglong(-(1 + n)) + 1, base);
+        *--p = '-';
+    } else {
+        p = qulltoa2(buff + buffsize, qulonglong(n), base);
+    }
+
+    clear();
+    append(p, buffsize - (p - buff));
     return *this;
 }
 
@@ -3644,14 +3668,12 @@ QByteArray &QByteArray::setNum(qlonglong n, int base)
 
 QByteArray &QByteArray::setNum(qulonglong n, int base)
 {
-#if defined(QT_CHECK_RANGE)
-    if (base < 2 || base > 36) {
-        qWarning("QByteArray::setNum: Invalid base %d", base);
-        base = 10;
-    }
-#endif
-    QLocale locale(QLocale::C);
-    *this = locale.d->unsLongLongToString(n, -1, base).toLatin1();
+    const int buffsize = 66; // big enough for MAX_ULLONG in base 2
+    char buff[buffsize];
+    char *p = qulltoa2(buff + buffsize, n, base);
+
+    clear();
+    append(p, buffsize - (p - buff));
     return *this;
 }
 
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 50e52a1ca7..860869e9c3 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -581,11 +581,11 @@ inline QByteArray &QByteArray::replace(const char *before, const char *after)
 { return replace(before, qstrlen(before), after, qstrlen(after)); }
 
 inline QByteArray &QByteArray::setNum(short n, int base)
-{ return setNum(qlonglong(n), base); }
+{ return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(ushort(n)), base); }
 inline QByteArray &QByteArray::setNum(ushort n, int base)
 { return setNum(qulonglong(n), base); }
 inline QByteArray &QByteArray::setNum(int n, int base)
-{ return setNum(qlonglong(n), base); }
+{ return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(uint(n)), base); }
 inline QByteArray &QByteArray::setNum(uint n, int base)
 { return setNum(qulonglong(n), base); }
 inline QByteArray &QByteArray::setNum(float n, char f, int prec)
diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp
index 5dc18ce99f..b8f2180a5b 100644
--- a/src/corelib/tools/qelapsedtimer_unix.cpp
+++ b/src/corelib/tools/qelapsedtimer_unix.cpp
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
  *  http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap02.html#tag_02_01_06 )
  *
  * The macro _POSIX_MONOTONIC_CLOCK can therefore assume the following values:
- *  -1          monotonic clock is never supported on this sytem
+ *  -1          monotonic clock is never supported on this system
  *   0          monotonic clock might be supported, runtime check is needed
  *  >1          (such as 200809L) monotonic clock is always supported
  *
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h
index 9efbdcb692..8b73b1d507 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/tools/qharfbuzz_p.h
@@ -54,8 +54,7 @@
 #define QHARFBUZZ_P_H
 
 #include <QtCore/qchar.h>
-
-#include <harfbuzz-shaper.h>
+#include <private/harfbuzz-shaper.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 3fab2f68e6..eca66d75b0 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -1261,7 +1261,7 @@ void QHashData::checkSanity()
 
 /*! \fn QHash::iterator QHash::begin()
 
-    Returns an \l{STL-style iterator} pointing to the first item in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
     the hash.
 
     \sa constBegin(), end()
@@ -1275,7 +1275,7 @@ void QHashData::checkSanity()
 /*! \fn QHash::const_iterator QHash::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the hash.
 
     \sa begin(), cend()
@@ -1283,7 +1283,7 @@ void QHashData::checkSanity()
 
 /*! \fn QHash::const_iterator QHash::constBegin() const
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the hash.
 
     \sa begin(), constEnd()
@@ -1291,7 +1291,7 @@ void QHashData::checkSanity()
 
 /*! \fn QHash::iterator QHash::end()
 
-    Returns an \l{STL-style iterator} pointing to the imaginary item
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
     after the last item in the hash.
 
     \sa begin(), constEnd()
@@ -1304,7 +1304,7 @@ void QHashData::checkSanity()
 
 /*! \fn QHash::const_iterator QHash::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the hash.
 
     \sa constBegin(), end()
@@ -1313,7 +1313,7 @@ void QHashData::checkSanity()
 /*! \fn QHash::const_iterator QHash::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the hash.
 
     \sa cbegin(), end()
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index 025d48b595..0c5894f150 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -320,7 +320,7 @@ const QLinkedListData QLinkedListData::shared_null = {
 
 /*! \fn QLinkedList::iterator QLinkedList::begin()
 
-    Returns an \l{STL-style iterator} pointing to the first item in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
     the list.
 
     \sa constBegin(), end()
@@ -334,7 +334,7 @@ const QLinkedListData QLinkedListData::shared_null = {
 /*! \fn QLinkedList::const_iterator QLinkedList::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the list.
 
     \sa begin(), cend()
@@ -342,7 +342,7 @@ const QLinkedListData QLinkedListData::shared_null = {
 
 /*! \fn QLinkedList::const_iterator QLinkedList::constBegin() const
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the list.
 
     \sa begin(), constEnd()
@@ -350,7 +350,7 @@ const QLinkedListData QLinkedListData::shared_null = {
 
 /*! \fn QLinkedList::iterator QLinkedList::end()
 
-    Returns an \l{STL-style iterator} pointing to the imaginary item
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
     after the last item in the list.
 
     \sa begin(), constEnd()
@@ -364,7 +364,7 @@ const QLinkedListData QLinkedListData::shared_null = {
 /*! \fn QLinkedList::const_iterator QLinkedList::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the list.
 
     \sa cbegin(), end()
@@ -372,7 +372,7 @@ const QLinkedListData QLinkedListData::shared_null = {
 
 /*! \fn QLinkedList::const_iterator QLinkedList::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the list.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 4f26b25fec..f31b184f81 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -915,7 +915,7 @@ void **QListData::erase(void **xi)
 
 /*! \fn QList::iterator QList::begin()
 
-    Returns an \l{STL-style iterator} pointing to the first item in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
     the list.
 
     \sa constBegin(), end()
@@ -929,7 +929,7 @@ void **QListData::erase(void **xi)
 /*! \fn QList::const_iterator QList::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the list.
 
     \sa begin(), cend()
@@ -937,7 +937,7 @@ void **QListData::erase(void **xi)
 
 /*! \fn QList::const_iterator QList::constBegin() const
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the list.
 
     \sa begin(), constEnd()
@@ -945,7 +945,7 @@ void **QListData::erase(void **xi)
 
 /*! \fn QList::iterator QList::end()
 
-    Returns an \l{STL-style iterator} pointing to the imaginary item
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
     after the last item in the list.
 
     \sa begin(), constEnd()
@@ -959,7 +959,7 @@ void **QListData::erase(void **xi)
 /*! \fn QList::const_iterator QList::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the list.
 
     \sa cbegin(), end()
@@ -967,7 +967,7 @@ void **QListData::erase(void **xi)
 
 /*! \fn QList::const_iterator QList::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the list.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index f5858bf22a..0d4c10fecd 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -368,7 +368,7 @@ Q_INLINE_TEMPLATE void QList<T>::node_construct(Node *n, const T &t)
     else *reinterpret_cast<T*>(n) = t;
 #else
     // This is always safe, but penaltizes unoptimized builds a lot.
-    else ::memcpy(n, &t, sizeof(T));
+    else ::memcpy(n, static_cast<const void *>(&t), sizeof(T));
 #endif
 }
 
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 4b4c94872e..582ae9ebef 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -2240,16 +2240,23 @@ QLocale::MeasurementSystem QLocale::measurementSystem() const
 */
 Qt::LayoutDirection QLocale::textDirection() const
 {
-    Language lang = language();
-    if (lang == QLocale::Arabic ||
-        lang == QLocale::Hebrew ||
-        lang == QLocale::Persian ||
-        lang == QLocale::Pashto ||
-        lang == QLocale::Urdu ||
-        lang == QLocale::Syriac ||
-        lang == QLocale::Divehi)
+    switch (language()) {
+    case QLocale::Arabic:
+    case QLocale::Hebrew:
+    case QLocale::Persian:
+    case QLocale::Pashto:
+    case QLocale::Urdu:
+    case QLocale::Syriac:
+    case QLocale::Divehi:
         return Qt::RightToLeft;
-
+    case QLocale::Punjabi:
+    case QLocale::Uzbek:
+        if (script() == QLocale::ArabicScript)
+            return Qt::RightToLeft;
+        // fall through
+    default:
+        break;
+    }
     return Qt::LeftToRight;
 }
 
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 6b6beeff0a..c9cb31d03b 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -67,6 +67,7 @@ class Q_CORE_EXPORT QLocale
     Q_GADGET
     Q_ENUMS(Language)
     Q_ENUMS(Country)
+    Q_ENUMS(MeasurementSystem)
     friend class QString;
     friend class QByteArray;
     friend class QIntValidator;
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index a31e089eca..43d2b3ade6 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -450,6 +450,7 @@
     \value Cambodia
     \value Cameroon
     \value Canada
+    \value CanaryIslands
     \value CapeVerde
     \value CaymanIslands
     \value CentralAfricanRepublic
@@ -457,6 +458,7 @@
     \value Chile
     \value China
     \value ChristmasIsland
+    \value ClippertonIsland
     \value CocosIslands
     \value Colombia
     \value Comoros
@@ -503,6 +505,7 @@
     \value Guadeloupe
     \value Guam
     \value Guatemala
+    \value Guernsey
     \value Guinea
     \value GuineaBissau
     \value Guyana
@@ -647,7 +650,7 @@
     \value Vanuatu
     \value VaticanCityState
     \value Venezuela
-    \value VietNam
+    \value Vietnam
     \value BritishVirginIslands
     \value UnitedStatesVirginIslands
     \value WallisAndFutunaIslands
@@ -718,7 +721,7 @@
     \value SinhalaScript
     \value SyriacScript
     \value YiScript
-    \value VaiiScript
+    \value VaiScript
     \omitvalue LastScript
 
     \sa script(), scriptToString(), languageToString()
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 7c33d60750..9f6b5f3f4f 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -811,7 +811,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 
 /*! \fn QMap::iterator QMap::begin()
 
-    Returns an \l{STL-style iterator} pointing to the first item in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
     the map.
 
     \sa constBegin(), end()
@@ -825,7 +825,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 /*! \fn QMap::const_iterator QMap::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the map.
 
     \sa begin(), cend()
@@ -833,7 +833,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 
 /*! \fn QMap::const_iterator QMap::constBegin() const
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the map.
 
     \sa begin(), constEnd()
@@ -841,7 +841,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 
 /*! \fn QMap::iterator QMap::end()
 
-    Returns an \l{STL-style iterator} pointing to the imaginary item
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
     after the last item in the map.
 
     \sa begin(), constEnd()
@@ -855,7 +855,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 /*! \fn QMap::const_iterator QMap::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the map.
 
     \sa cbegin(), end()
@@ -863,7 +863,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 
 /*! \fn QMap::const_iterator QMap::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the map.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 4d73fc7478..e441d5320b 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -3920,7 +3920,7 @@ static void invalidateEngine(QRegExpPrivate *priv)
 
     \value Wildcard This provides a simple pattern matching syntax
     similar to that used by shells (command interpreters) for "file
-    globbing". See \l{Wildcard Matching}.
+    globbing". See \l{QRegExp wildcard matching}.
 
     \value WildcardUnix This is similar to Wildcard but with the
     behavior of a Unix shell. The wildcard characters can be escaped
@@ -4150,7 +4150,7 @@ QRegExp::PatternSyntax QRegExp::patternSyntax() const
     QRegExp::RegExp.
 
     Setting \a syntax to QRegExp::Wildcard enables simple shell-like
-    \l{wildcard matching}. For example, \b{r*.txt} matches the
+    \l{QRegExp wildcard matching}. For example, \b{r*.txt} matches the
     string \c{readme.txt} in wildcard mode, but does not match
     \c{readme}.
 
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc
index 6649d5ba69..dc07f482f9 100644
--- a/src/corelib/tools/qset.qdoc
+++ b/src/corelib/tools/qset.qdoc
@@ -330,7 +330,7 @@
 
 /*! \fn QSet::const_iterator QSet::begin() const
 
-    Returns a const \l{STL-style iterator} positioned at the first
+    Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the first
     item in the set.
 
     \sa constBegin(), end()
@@ -340,14 +340,14 @@
     \since 4.2
     \overload
 
-    Returns a non-const \l{STL-style iterator} positioned at the first
+    Returns a non-const \l{STL-style iterators}{STL-style iterator} positioned at the first
     item in the set.  
 */
 
 /*! \fn QSet::const_iterator QSet::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} positioned at the first
+    Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the first
     item in the set.
 
     \sa begin(), cend()
@@ -355,7 +355,7 @@
 
 /*! \fn QSet::const_iterator QSet::constBegin() const
 
-    Returns a const \l{STL-style iterator} positioned at the first
+    Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the first
     item in the set.
 
     \sa begin(), constEnd()
@@ -363,7 +363,7 @@
 
 /*! \fn QSet::const_iterator QSet::end() const
 
-    Returns a const \l{STL-style iterator} positioned at the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the imaginary
     item after the last item in the set.
 
     \sa constEnd(), begin()
@@ -373,14 +373,14 @@
     \since 4.2
     \overload
 
-    Returns a non-const \l{STL-style iterator} pointing to the
+    Returns a non-const \l{STL-style iterators}{STL-style iterator} pointing to the
     imaginary item after the last item in the set.
 */
 
 /*! \fn QSet::const_iterator QSet::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the set.
 
     \sa cbegin(), end()
@@ -388,7 +388,7 @@
 
 /*! \fn QSet::const_iterator QSet::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the set.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 34a8cbe4c8..6db4fed0f8 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -840,7 +840,7 @@ const QString::Null QString::null = { };
 
 /*! \fn QString::iterator QString::begin()
 
-    Returns an \l{STL-style iterator} pointing to the first character in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first character in
     the string.
 
     \sa constBegin(), end()
@@ -854,7 +854,7 @@ const QString::Null QString::null = { };
 /*! \fn QString::const_iterator QString::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first character
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first character
     in the string.
 
     \sa begin(), cend()
@@ -862,7 +862,7 @@ const QString::Null QString::null = { };
 
 /*! \fn QString::const_iterator QString::constBegin() const
 
-    Returns a const \l{STL-style iterator} pointing to the first character
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first character
     in the string.
 
     \sa begin(), constEnd()
@@ -870,7 +870,7 @@ const QString::Null QString::null = { };
 
 /*! \fn QString::iterator QString::end()
 
-    Returns an \l{STL-style iterator} pointing to the imaginary character
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary character
     after the last character in the string.
 
     \sa begin(), constEnd()
@@ -884,7 +884,7 @@ const QString::Null QString::null = { };
 /*! \fn QString::const_iterator QString::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the list.
 
     \sa cbegin(), end()
@@ -892,7 +892,7 @@ const QString::Null QString::null = { };
 
 /*! \fn QString::const_iterator QString::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the list.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/tools/qunicodetools.cpp
index 8bafb692ca..f83e2b5911 100644
--- a/src/corelib/tools/qunicodetools.cpp
+++ b/src/corelib/tools/qunicodetools.cpp
@@ -44,7 +44,8 @@
 #include "qunicodetables_p.h"
 #include "qvarlengtharray.h"
 
-#include "qharfbuzz_p.h"
+#include <private/harfbuzz-shaper.h>
+#include <private/qharfbuzz_p.h>
 
 #define FLAG(x) (1 << (x))
 
diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc
index 452bc0a598..0481373f2d 100644
--- a/src/corelib/tools/qvarlengtharray.qdoc
+++ b/src/corelib/tools/qvarlengtharray.qdoc
@@ -483,7 +483,7 @@
 /*! \fn QVarLengthArray::iterator QVarLengthArray::begin()
     \since 4.8
 
-    Returns an \l{STL-style iterator} pointing to the first item in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
     the array.
 
     \sa constBegin(), end()
@@ -497,7 +497,7 @@
 /*! \fn QVarLengthArray::const_iterator QVarLengthArray::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the array.
 
     \sa begin(), cend()
@@ -506,7 +506,7 @@
 /*! \fn QVarLengthArray::const_iterator QVarLengthArray::constBegin() const
     \since 4.8
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the array.
 
     \sa begin(), constEnd()
@@ -515,7 +515,7 @@
 /*! \fn QVarLengthArray::iterator QVarLengthArray::end()
     \since 4.8
 
-    Returns an \l{STL-style iterator} pointing to the imaginary item
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
     after the last item in the array.
 
     \sa begin(), constEnd()
@@ -530,7 +530,7 @@
 /*! \fn QVarLengthArray::const_iterator QVarLengthArray::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the array.
 
     \sa cbegin(), end()
@@ -539,7 +539,7 @@
 /*! \fn QVarLengthArray::const_iterator QVarLengthArray::constEnd() const
     \since 4.8
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the array.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index f33bb930c2..ab8127159f 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -636,7 +636,7 @@
 
 /*! \fn QVector::iterator QVector::begin()
 
-    Returns an \l{STL-style iterator} pointing to the first item in
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
     the vector.
 
     \sa constBegin(), end()
@@ -650,7 +650,7 @@
 /*! \fn QVector::const_iterator QVector::cbegin() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the vector.
 
     \sa begin(), cend()
@@ -658,7 +658,7 @@
 
 /*! \fn QVector::const_iterator QVector::constBegin() const
 
-    Returns a const \l{STL-style iterator} pointing to the first item
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
     in the vector.
 
     \sa begin(), constEnd()
@@ -666,7 +666,7 @@
 
 /*! \fn QVector::iterator QVector::end()
 
-    Returns an \l{STL-style iterator} pointing to the imaginary item
+    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
     after the last item in the vector.
 
     \sa begin(), constEnd()
@@ -680,7 +680,7 @@
 /*! \fn QVector::const_iterator QVector::cend() const
     \since 5.0
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the vector.
 
     \sa cbegin(), end()
@@ -688,7 +688,7 @@
 
 /*! \fn QVector::const_iterator QVector::constEnd() const
 
-    Returns a const \l{STL-style iterator} pointing to the imaginary
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
     item after the last item in the vector.
 
     \sa constBegin(), end()
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 88a59f5f77..564aff9ab9 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -133,7 +133,6 @@ pcre {
 }
 
 DEFINES += HB_EXPORT=Q_CORE_EXPORT
-INCLUDEPATH += ../3rdparty/harfbuzz/src
 HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h
 SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
            ../3rdparty/harfbuzz/src/harfbuzz-gdef.c \
@@ -146,8 +145,6 @@ SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
            tools/qharfbuzz.cpp
 HEADERS += tools/qharfbuzz_p.h
 
-private_headers.files += ../3rdparty/harfbuzz/src/*.h
-
 INCLUDEPATH += ../3rdparty/md5 \
                ../3rdparty/md4