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

Change-Id: Iec636692e8b7d1fe1bc0476e49c5054a5892d639

16 files changed, 104 insertions, 1275 deletions

diff --git a/src/corelib/doc/src/json.qdoc b/src/corelib/doc/src/json.qdoc
index 4c7e62a10a..a32772f910 100644
--- a/src/corelib/doc/src/json.qdoc
+++ b/src/corelib/doc/src/json.qdoc
@@ -45,7 +45,7 @@
     access.
 
     More details about the JSON data format can be found at \l{http://json.org}{json.org}
-    and in \l{https://tools.ietf.org/html/rfc7159}{RFC-7159}.
+    and in \l{http://tools.ietf.org/html/rfc4627}{RFC-4627}.
 
     \tableofcontents
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index aa9446221b..cd4b4a29a9 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -549,7 +549,7 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed;
 #  define Q_ALWAYS_INLINE inline
 #endif
 
-#ifdef Q_CC_GNU
+#if defined(Q_CC_GNU) && defined(Q_OS_WIN)
 #  define QT_INIT_METAOBJECT __attribute__((init_priority(101)))
 #else
 #  define QT_INIT_METAOBJECT
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp
deleted file mode 100644
index 255dc2ee4e..0000000000
--- a/src/corelib/json/qjsonarray.cpp
+++ /dev/null
@@ -1,1238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdebug.h>
-
-#include "qjsonwriter_p.h"
-#include "qjson_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QJsonArray
-    \inmodule QtCore
-    \ingroup json
-    \ingroup shared
-    \reentrant
-    \since 5.0
-
-    \brief The QJsonArray class encapsulates a JSON array.
-
-    A JSON array is a list of values. The list can be manipulated by inserting and
-    removing QJsonValue's from the array.
-
-    A QJsonArray can be converted to and from a QVariantList. You can query the
-    number of entries with size(), insert(), and removeAt() entries from it
-    and iterate over its content using the standard C++ iterator pattern.
-
-    QJsonArray is an implicitly shared class and shares the data with the document
-    it has been created from as long as it is not being modified.
-
-    You can convert the array to and from text based JSON through QJsonDocument.
-
-    \sa {JSON Support in Qt}, {JSON Save Game Example}
-*/
-
-/*!
-    \typedef QJsonArray::Iterator
-
-    Qt-style synonym for QJsonArray::iterator.
-*/
-
-/*!
-    \typedef QJsonArray::ConstIterator
-
-    Qt-style synonym for QJsonArray::const_iterator.
-*/
-
-/*!
-    \typedef QJsonArray::size_type
-
-    Typedef for int. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QJsonArray::value_type
-
-    Typedef for QJsonValue. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QJsonArray::difference_type
-
-    Typedef for int. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QJsonArray::pointer
-
-    Typedef for QJsonValue *. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QJsonArray::const_pointer
-
-    Typedef for const QJsonValue *. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QJsonArray::reference
-
-    Typedef for QJsonValue &. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QJsonArray::const_reference
-
-    Typedef for const QJsonValue &. Provided for STL compatibility.
-*/
-
-/*!
-    Creates an empty array.
- */
-QJsonArray::QJsonArray()
-    : d(0), a(0)
-{
-}
-
-/*!
-    \fn QJsonArray::QJsonArray(std::initializer_list<QJsonValue> args)
-    \since 5.4
-    Creates an array initialized from \a args initialization list.
-
-    QJsonArray can be constructed in a way similar to JSON notation,
-    for example:
-    \code
-    QJsonArray array = { 1, 2.2, QString() };
-    \endcode
- */
-
-/*!
-    \internal
- */
-QJsonArray::QJsonArray(QJsonPrivate::Data *data, QJsonPrivate::Array *array)
-    : d(data), a(array)
-{
-    Q_ASSERT(data);
-    Q_ASSERT(array);
-    d->ref.ref();
-}
-
-/*!
-    This method replaces part of QJsonArray(std::initializer_list<QJsonValue> args) .
-    The constructor needs to be inline, but we do not want to leak implementation details
-    of this class.
-    \note this method is called for an uninitialized object
-    \internal
- */
-void QJsonArray::initialize()
-{
-    d = 0;
-    a = 0;
-}
-
-/*!
-    Deletes the array.
- */
-QJsonArray::~QJsonArray()
-{
-    if (d && !d->ref.deref())
-        delete d;
-}
-
-/*!
-    Creates a copy of \a other.
-
-    Since QJsonArray is implicitly shared, the copy is shallow
-    as long as the object doesn't get modified.
- */
-QJsonArray::QJsonArray(const QJsonArray &other)
-{
-    d = other.d;
-    a = other.a;
-    if (d)
-        d->ref.ref();
-}
-
-/*!
-    Assigns \a other to this array.
- */
-QJsonArray &QJsonArray::operator =(const QJsonArray &other)
-{
-    if (d != other.d) {
-        if (d && !d->ref.deref())
-            delete d;
-        d = other.d;
-        if (d)
-            d->ref.ref();
-    }
-    a = other.a;
-
-    return *this;
-}
-
-/*! \fn QJsonArray &QJsonArray::operator+=(const QJsonValue &value)
-
-    Appends \a value to the array, and returns a reference to the array itself.
-
-    \since 5.3
-    \sa append(), operator<<()
-*/
-
-/*! \fn QJsonArray QJsonArray::operator+(const QJsonValue &value) const
-
-    Returns an array that contains all the items in this array followed
-    by the provided \a value.
-
-    \since 5.3
-    \sa operator+=()
-*/
-
-/*! \fn QJsonArray &QJsonArray::operator<<(const QJsonValue &value)
-
-    Appends \a value to the array, and returns a reference to the array itself.
-
-    \since 5.3
-    \sa operator+=(), append()
-*/
-
-/*!
-    Converts the string list \a list to a QJsonArray.
-
-    The values in \a list will be converted to JSON values.
-
-    \sa toVariantList(), QJsonValue::fromVariant()
- */
-QJsonArray QJsonArray::fromStringList(const QStringList &list)
-{
-    QJsonArray array;
-    for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
-        array.append(QJsonValue(*it));
-    return array;
-}
-
-/*!
-    Converts the variant list \a list to a QJsonArray.
-
-    The QVariant values in \a list will be converted to JSON values.
-
-    \sa toVariantList(), QJsonValue::fromVariant()
- */
-QJsonArray QJsonArray::fromVariantList(const QVariantList &list)
-{
-    QJsonArray array;
-    if (list.isEmpty())
-        return array;
-
-    array.detach2(1024);
-
-    QVector<QJsonPrivate::Value> values;
-    values.resize(list.size());
-    QJsonPrivate::Value *valueData = values.data();
-    uint currentOffset = sizeof(QJsonPrivate::Base);
-
-    for (int i = 0; i < list.size(); ++i) {
-        QJsonValue val = QJsonValue::fromVariant(list.at(i));
-
-        bool latinOrIntValue;
-        int valueSize = QJsonPrivate::Value::requiredStorage(val, &latinOrIntValue);
-
-        if (!array.detach2(valueSize))
-            return QJsonArray();
-
-        QJsonPrivate::Value *v = valueData + i;
-        v->type = (val.t == QJsonValue::Undefined ? QJsonValue::Null : val.t);
-        v->latinOrIntValue = latinOrIntValue;
-        v->latinKey = false;
-        v->value = QJsonPrivate::Value::valueToStore(val, currentOffset);
-        if (valueSize)
-            QJsonPrivate::Value::copyData(val, (char *)array.a + currentOffset, latinOrIntValue);
-
-        currentOffset += valueSize;
-        array.a->size = currentOffset;
-    }
-
-    // write table
-    array.a->tableOffset = currentOffset;
-    if (!array.detach2(sizeof(QJsonPrivate::offset)*values.size()))
-        return QJsonArray();
-    memcpy(static_cast<void *>(array.a->table()),
-           static_cast<const void *>(values.constData()), values.size()*sizeof(uint));
-    array.a->length = values.size();
-    array.a->size = currentOffset + sizeof(QJsonPrivate::offset)*values.size();
-
-    return array;
-}
-
-/*!
-    Converts this object to a QVariantList.
-
-    Returns the created map.
- */
-QVariantList QJsonArray::toVariantList() const
-{
-    QVariantList list;
-
-    if (a) {
-        list.reserve(a->length);
-        for (int i = 0; i < (int)a->length; ++i)
-            list.append(QJsonValue(d, a, a->at(i)).toVariant());
-    }
-    return list;
-}
-
-
-/*!
-    Returns the number of values stored in the array.
- */
-int QJsonArray::size() const
-{
-    if (!d)
-        return 0;
-
-    return (int)a->length;
-}
-
-/*!
-    \fn QJsonArray::count() const
-
-    Same as size().
-
-    \sa size()
-*/
-
-/*!
-    Returns \c true if the object is empty. This is the same as size() == 0.
-
-    \sa size()
- */
-bool QJsonArray::isEmpty() const
-{
-    if (!d)
-        return true;
-
-    return !a->length;
-}
-
-/*!
-    Returns a QJsonValue representing the value for index \a i.
-
-    The returned QJsonValue is \c Undefined, if \a i is out of bounds.
-
- */
-QJsonValue QJsonArray::at(int i) const
-{
-    if (!a || i < 0 || i >= (int)a->length)
-        return QJsonValue(QJsonValue::Undefined);
-
-    return QJsonValue(d, a, a->at(i));
-}
-
-/*!
-    Returns the first value stored in the array.
-
-    Same as \c at(0).
-
-    \sa at()
- */
-QJsonValue QJsonArray::first() const
-{
-    return at(0);
-}
-
-/*!
-    Returns the last value stored in the array.
-
-    Same as \c{at(size() - 1)}.
-
-    \sa at()
- */
-QJsonValue QJsonArray::last() const
-{
-    return at(a ? (a->length - 1) : 0);
-}
-
-/*!
-    Inserts \a value at the beginning of the array.
-
-    This is the same as \c{insert(0, value)} and will prepend \a value to the array.
-
-    \sa append(), insert()
- */
-void QJsonArray::prepend(const QJsonValue &value)
-{
-    insert(0, value);
-}
-
-/*!
-    Inserts \a value at the end of the array.
-
-    \sa prepend(), insert()
- */
-void QJsonArray::append(const QJsonValue &value)
-{
-    insert(a ? (int)a->length : 0, value);
-}
-
-/*!
-    Removes the value at index position \a i. \a i must be a valid
-    index position in the array (i.e., \c{0 <= i < size()}).
-
-    \sa insert(), replace()
- */
-void QJsonArray::removeAt(int i)
-{
-    if (!a || i < 0 || i >= (int)a->length)
-        return;
-
-    detach2();
-    a->removeItems(i, 1);
-    ++d->compactionCounter;
-    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(a->length) / 2u)
-        compact();
-}
-
-/*! \fn void QJsonArray::removeFirst()
-
-    Removes the first item in the array. Calling this function is
-    equivalent to calling \c{removeAt(0)}. The array must not be empty. If
-    the array can be empty, call isEmpty() before calling this
-    function.
-
-    \sa removeAt(), removeLast()
-*/
-
-/*! \fn void QJsonArray::removeLast()
-
-    Removes the last item in the array. Calling this function is
-    equivalent to calling \c{removeAt(size() - 1)}. The array must not be
-    empty. If the array can be empty, call isEmpty() before calling
-    this function.
-
-    \sa removeAt(), removeFirst()
-*/
-
-/*!
-    Removes the item at index position \a i and returns it. \a i must
-    be a valid index position in the array (i.e., \c{0 <= i < size()}).
-
-    If you don't use the return value, removeAt() is more efficient.
-
-    \sa removeAt()
- */
-QJsonValue QJsonArray::takeAt(int i)
-{
-    if (!a || i < 0 || i >= (int)a->length)
-        return QJsonValue(QJsonValue::Undefined);
-
-    QJsonValue v(d, a, a->at(i));
-    removeAt(i); // detaches
-    return v;
-}
-
-/*!
-    Inserts \a value at index position \a i in the array. If \a i
-    is \c 0, the value is prepended to the array. If \a i is size(), the
-    value is appended to the array.
-
-    \sa append(), prepend(), replace(), removeAt()
- */
-void QJsonArray::insert(int i, const QJsonValue &value)
-{
-    Q_ASSERT (i >= 0 && i <= (a ? (int)a->length : 0));
-    QJsonValue val = value;
-
-    bool compressed;
-    int valueSize = QJsonPrivate::Value::requiredStorage(val, &compressed);
-
-    if (!detach2(valueSize + sizeof(QJsonPrivate::Value)))
-        return;
-
-    if (!a->length)
-        a->tableOffset = sizeof(QJsonPrivate::Array);
-
-    int valueOffset = a->reserveSpace(valueSize, i, 1, false);
-    if (!valueOffset)
-        return;
-
-    QJsonPrivate::Value &v = (*a)[i];
-    v.type = (val.t == QJsonValue::Undefined ? QJsonValue::Null : val.t);
-    v.latinOrIntValue = compressed;
-    v.latinKey = false;
-    v.value = QJsonPrivate::Value::valueToStore(val, valueOffset);
-    if (valueSize)
-        QJsonPrivate::Value::copyData(val, (char *)a + valueOffset, compressed);
-}
-
-/*!
-    \fn QJsonArray::iterator QJsonArray::insert(iterator before, const QJsonValue &value)
-
-    Inserts \a value before the position pointed to by \a before, and returns an iterator
-    pointing to the newly inserted item.
-
-    \sa erase(), insert()
-*/
-
-/*!
-    \fn QJsonArray::iterator QJsonArray::erase(iterator it)
-
-    Removes the item pointed to by \a it, and returns an iterator pointing to the
-    next item.
-
-    \sa removeAt()
-*/
-
-/*!
-    Replaces the item at index position \a i with \a value. \a i must
-    be a valid index position in the array (i.e., \c{0 <= i < size()}).
-
-    \sa operator[](), removeAt()
- */
-void QJsonArray::replace(int i, const QJsonValue &value)
-{
-    Q_ASSERT (a && i >= 0 && i < (int)(a->length));
-    QJsonValue val = value;
-
-    bool compressed;
-    int valueSize = QJsonPrivate::Value::requiredStorage(val, &compressed);
-
-    if (!detach2(valueSize))
-        return;
-
-    if (!a->length)
-        a->tableOffset = sizeof(QJsonPrivate::Array);
-
-    int valueOffset = a->reserveSpace(valueSize, i, 1, true);
-    if (!valueOffset)
-        return;
-
-    QJsonPrivate::Value &v = (*a)[i];
-    v.type = (val.t == QJsonValue::Undefined ? QJsonValue::Null : val.t);
-    v.latinOrIntValue = compressed;
-    v.latinKey = false;
-    v.value = QJsonPrivate::Value::valueToStore(val, valueOffset);
-    if (valueSize)
-        QJsonPrivate::Value::copyData(val, (char *)a + valueOffset, compressed);
-
-    ++d->compactionCounter;
-    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(a->length) / 2u)
-        compact();
-}
-
-/*!
-    Returns \c true if the array contains an occurrence of \a value, otherwise \c false.
-
-    \sa count()
- */
-bool QJsonArray::contains(const QJsonValue &value) const
-{
-    for (int i = 0; i < size(); i++) {
-        if (at(i) == value)
-            return true;
-    }
-    return false;
-}
-
-/*!
-    Returns the value at index position \a i as a modifiable reference.
-    \a i must be a valid index position in the array (i.e., \c{0 <= i <
-    size()}).
-
-    The return value is of type QJsonValueRef, a helper class for QJsonArray
-    and QJsonObject. When you get an object of type QJsonValueRef, you can
-    use it as if it were a reference to a QJsonValue. If you assign to it,
-    the assignment will apply to the character in the QJsonArray of QJsonObject
-    from which you got the reference.
-
-    \sa at()
- */
-QJsonValueRef QJsonArray::operator [](int i)
-{
-    Q_ASSERT(a && i >= 0 && i < (int)a->length);
-    return QJsonValueRef(this, i);
-}
-
-/*!
-    \overload
-
-    Same as at().
- */
-QJsonValue QJsonArray::operator[](int i) const
-{
-    return at(i);
-}
-
-/*!
-    Returns \c true if this array is equal to \a other.
- */
-bool QJsonArray::operator==(const QJsonArray &other) const
-{
-    if (a == other.a)
-        return true;
-
-    if (!a)
-        return !other.a->length;
-    if (!other.a)
-        return !a->length;
-    if (a->length != other.a->length)
-        return false;
-
-    for (int i = 0; i < (int)a->length; ++i) {
-        if (QJsonValue(d, a, a->at(i)) != QJsonValue(other.d, other.a, other.a->at(i)))
-            return false;
-    }
-    return true;
-}
-
-/*!
-    Returns \c true if this array is not equal to \a other.
- */
-bool QJsonArray::operator!=(const QJsonArray &other) const
-{
-    return !(*this == other);
-}
-
-/*! \fn QJsonArray::iterator QJsonArray::begin()
-
-    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
-    the array.
-
-    \sa constBegin(), end()
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::begin() const
-
-    \overload
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::constBegin() const
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
-    in the array.
-
-    \sa begin(), constEnd()
-*/
-
-/*! \fn QJsonArray::iterator QJsonArray::end()
-
-    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
-    after the last item in the array.
-
-    \sa begin(), constEnd()
-*/
-
-/*! \fn const_iterator QJsonArray::end() const
-
-    \overload
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::constEnd() const
-
-    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()
-*/
-
-/*! \fn void QJsonArray::push_back(const QJsonValue &value)
-
-    This function is provided for STL compatibility. It is equivalent
-    to \l{QJsonArray::append()}{append(value)} and will append \a value to the array.
-*/
-
-/*! \fn void QJsonArray::push_front(const QJsonValue &value)
-
-    This function is provided for STL compatibility. It is equivalent
-    to \l{QJsonArray::prepend()}{prepend(value)} and will prepend \a value to the array.
-*/
-
-/*! \fn void QJsonArray::pop_front()
-
-    This function is provided for STL compatibility. It is equivalent
-    to removeFirst(). The array must not be empty. If the array can be
-    empty, call isEmpty() before calling this function.
-*/
-
-/*! \fn void QJsonArray::pop_back()
-
-    This function is provided for STL compatibility. It is equivalent
-    to removeLast(). The array must not be empty. If the array can be
-    empty, call isEmpty() before calling this function.
-*/
-
-/*! \fn bool QJsonArray::empty() const
-
-    This function is provided for STL compatibility. It is equivalent
-    to isEmpty() and returns \c true if the array is empty.
-*/
-
-/*! \class QJsonArray::iterator
-    \inmodule QtCore
-    \brief The QJsonArray::iterator class provides an STL-style non-const iterator for QJsonArray.
-
-    QJsonArray::iterator allows you to iterate over a QJsonArray
-    and to modify the array item associated with the
-    iterator. If you want to iterate over a const QJsonArray, use
-    QJsonArray::const_iterator instead. It is generally a good practice to
-    use QJsonArray::const_iterator on a non-const QJsonArray as well, unless
-    you need to change the QJsonArray through the iterator. Const
-    iterators are slightly faster and improves code readability.
-
-    The default QJsonArray::iterator constructor creates an uninitialized
-    iterator. You must initialize it using a QJsonArray function like
-    QJsonArray::begin(), QJsonArray::end(), or QJsonArray::insert() before you can
-    start iterating.
-
-    Most QJsonArray functions accept an integer index rather than an
-    iterator. For that reason, iterators are rarely useful in
-    connection with QJsonArray. One place where STL-style iterators do
-    make sense is as arguments to \l{generic algorithms}.
-
-    Multiple iterators can be used on the same array. However, be
-    aware that any non-const function call performed on the QJsonArray
-    will render all existing iterators undefined.
-
-    \sa QJsonArray::const_iterator
-*/
-
-/*! \typedef QJsonArray::iterator::iterator_category
-
-  A synonym for \e {std::random_access_iterator_tag} indicating
-  this iterator is a random access iterator.
-*/
-
-/*! \typedef QJsonArray::iterator::difference_type
-
-    \internal
-*/
-
-/*! \typedef QJsonArray::iterator::value_type
-
-    \internal
-*/
-
-/*! \typedef QJsonArray::iterator::reference
-
-    \internal
-*/
-
-/*! \typedef QJsonArray::iterator::pointer
-
-    \internal
-*/
-
-/*! \fn QJsonArray::iterator::iterator()
-
-    Constructs an uninitialized iterator.
-
-    Functions like operator*() and operator++() should not be called
-    on an uninitialized iterator. Use operator=() to assign a value
-    to it before using it.
-
-    \sa QJsonArray::begin(), QJsonArray::end()
-*/
-
-/*! \fn QJsonArray::iterator::iterator(QJsonArray *array, int index)
-    \internal
-*/
-
-/*! \fn QJsonValueRef QJsonArray::iterator::operator*() const
-
-
-    Returns a modifiable reference to the current item.
-
-    You can change the value of an item by using operator*() on the
-    left side of an assignment.
-
-    The return value is of type QJsonValueRef, a helper class for QJsonArray
-    and QJsonObject. When you get an object of type QJsonValueRef, you can
-    use it as if it were a reference to a QJsonValue. If you assign to it,
-    the assignment will apply to the character in the QJsonArray of QJsonObject
-    from which you got the reference.
-*/
-
-/*! \fn QJsonValueRef *QJsonArray::iterator::operator->() const
-
-    Returns a pointer to a modifiable reference to the current item.
-*/
-
-/*! \fn QJsonValueRef QJsonArray::iterator::operator[](int j) const
-
-    Returns a modifiable reference to the item at offset \a j from the
-    item pointed to by this iterator (the item at position \c{*this + j}).
-
-    This function is provided to make QJsonArray iterators behave like C++
-    pointers.
-
-    The return value is of type QJsonValueRef, a helper class for QJsonArray
-    and QJsonObject. When you get an object of type QJsonValueRef, you can
-    use it as if it were a reference to a QJsonValue. If you assign to it,
-    the assignment will apply to the character in the QJsonArray of QJsonObject
-    from which you got the reference.
-
-    \sa operator+()
-*/
-
-/*!
-    \fn bool QJsonArray::iterator::operator==(const iterator &other) const
-    \fn bool QJsonArray::iterator::operator==(const const_iterator &other) const
-
-    Returns \c true if \a other points to the same item as this
-    iterator; otherwise returns \c false.
-
-    \sa operator!=()
-*/
-
-/*!
-    \fn bool QJsonArray::iterator::operator!=(const iterator &other) const
-    \fn bool QJsonArray::iterator::operator!=(const const_iterator &other) const
-
-    Returns \c true if \a other points to a different item than this
-    iterator; otherwise returns \c false.
-
-    \sa operator==()
-*/
-
-/*!
-    \fn bool QJsonArray::iterator::operator<(const iterator& other) const
-    \fn bool QJsonArray::iterator::operator<(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn bool QJsonArray::iterator::operator<=(const iterator& other) const
-    \fn bool QJsonArray::iterator::operator<=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    or equal to the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn bool QJsonArray::iterator::operator>(const iterator& other) const
-    \fn bool QJsonArray::iterator::operator>(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn bool QJsonArray::iterator::operator>=(const iterator& other) const
-    \fn bool QJsonArray::iterator::operator>=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than or equal to the item pointed to by the \a other iterator.
-*/
-
-/*! \fn QJsonArray::iterator &QJsonArray::iterator::operator++()
-
-    The prefix ++ operator, \c{++it}, advances the iterator to the
-    next item in the array and returns an iterator to the new current
-    item.
-
-    Calling this function on QJsonArray::end() leads to undefined results.
-
-    \sa operator--()
-*/
-
-/*! \fn QJsonArray::iterator QJsonArray::iterator::operator++(int)
-
-    \overload
-
-    The postfix ++ operator, \c{it++}, advances the iterator to the
-    next item in the array and returns an iterator to the previously
-    current item.
-*/
-
-/*! \fn QJsonArray::iterator &QJsonArray::iterator::operator--()
-
-    The prefix -- operator, \c{--it}, makes the preceding item
-    current and returns an iterator to the new current item.
-
-    Calling this function on QJsonArray::begin() leads to undefined results.
-
-    \sa operator++()
-*/
-
-/*! \fn QJsonArray::iterator QJsonArray::iterator::operator--(int)
-
-    \overload
-
-    The postfix -- operator, \c{it--}, makes the preceding item
-    current and returns an iterator to the previously current item.
-*/
-
-/*! \fn QJsonArray::iterator &QJsonArray::iterator::operator+=(int j)
-
-    Advances the iterator by \a j items. If \a j is negative, the
-    iterator goes backward.
-
-    \sa operator-=(), operator+()
-*/
-
-/*! \fn QJsonArray::iterator &QJsonArray::iterator::operator-=(int j)
-
-    Makes the iterator go back by \a j items. If \a j is negative,
-    the iterator goes forward.
-
-    \sa operator+=(), operator-()
-*/
-
-/*! \fn QJsonArray::iterator QJsonArray::iterator::operator+(int j) const
-
-    Returns an iterator to the item at \a j positions forward from
-    this iterator. If \a j is negative, the iterator goes backward.
-
-    \sa operator-(), operator+=()
-*/
-
-/*! \fn QJsonArray::iterator QJsonArray::iterator::operator-(int j) const
-
-    Returns an iterator to the item at \a j positions backward from
-    this iterator. If \a j is negative, the iterator goes forward.
-
-    \sa operator+(), operator-=()
-*/
-
-/*! \fn int QJsonArray::iterator::operator-(iterator other) const
-
-    Returns the number of items between the item pointed to by \a
-    other and the item pointed to by this iterator.
-*/
-
-/*! \class QJsonArray::const_iterator
-    \inmodule QtCore
-    \brief The QJsonArray::const_iterator class provides an STL-style const iterator for QJsonArray.
-
-    QJsonArray::const_iterator allows you to iterate over a
-    QJsonArray. If you want to modify the QJsonArray as
-    you iterate over it, use QJsonArray::iterator instead. It is generally a
-    good practice to use QJsonArray::const_iterator on a non-const QJsonArray
-    as well, unless you need to change the QJsonArray through the
-    iterator. Const iterators are slightly faster and improves
-    code readability.
-
-    The default QJsonArray::const_iterator constructor creates an
-    uninitialized iterator. You must initialize it using a QJsonArray
-    function like QJsonArray::constBegin(), QJsonArray::constEnd(), or
-    QJsonArray::insert() before you can start iterating.
-
-    Most QJsonArray functions accept an integer index rather than an
-    iterator. For that reason, iterators are rarely useful in
-    connection with QJsonArray. One place where STL-style iterators do
-    make sense is as arguments to \l{generic algorithms}.
-
-    Multiple iterators can be used on the same array. However, be
-    aware that any non-const function call performed on the QJsonArray
-    will render all existing iterators undefined.
-
-    \sa QJsonArray::iterator
-*/
-
-/*! \fn QJsonArray::const_iterator::const_iterator()
-
-    Constructs an uninitialized iterator.
-
-    Functions like operator*() and operator++() should not be called
-    on an uninitialized iterator. Use operator=() to assign a value
-    to it before using it.
-
-    \sa QJsonArray::constBegin(), QJsonArray::constEnd()
-*/
-
-/*! \fn QJsonArray::const_iterator::const_iterator(const QJsonArray *array, int index)
-    \internal
-*/
-
-/*! \typedef QJsonArray::const_iterator::iterator_category
-
-  A synonym for \e {std::random_access_iterator_tag} indicating
-  this iterator is a random access iterator.
-*/
-
-/*! \typedef QJsonArray::const_iterator::difference_type
-
-    \internal
-*/
-
-/*! \typedef QJsonArray::const_iterator::value_type
-
-    \internal
-*/
-
-/*! \typedef QJsonArray::const_iterator::reference
-
-    \internal
-*/
-
-/*! \typedef QJsonArray::const_iterator::pointer
-
-    \internal
-*/
-
-/*! \fn QJsonArray::const_iterator::const_iterator(const const_iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn QJsonArray::const_iterator::const_iterator(const iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn QJsonValue QJsonArray::const_iterator::operator*() const
-
-    Returns the current item.
-*/
-
-/*! \fn QJsonValue *QJsonArray::const_iterator::operator->() const
-
-    Returns a pointer to the current item.
-*/
-
-/*! \fn QJsonValue QJsonArray::const_iterator::operator[](int j) const
-
-    Returns the item at offset \a j from the item pointed to by this iterator (the item at
-    position \c{*this + j}).
-
-    This function is provided to make QJsonArray iterators behave like C++
-    pointers.
-
-    \sa operator+()
-*/
-
-/*! \fn bool QJsonArray::const_iterator::operator==(const const_iterator &other) const
-
-    Returns \c true if \a other points to the same item as this
-    iterator; otherwise returns \c false.
-
-    \sa operator!=()
-*/
-
-/*! \fn bool QJsonArray::const_iterator::operator!=(const const_iterator &other) const
-
-    Returns \c true if \a other points to a different item than this
-    iterator; otherwise returns \c false.
-
-    \sa operator==()
-*/
-
-/*!
-    \fn bool QJsonArray::const_iterator::operator<(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn bool QJsonArray::const_iterator::operator<=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    or equal to the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn bool QJsonArray::const_iterator::operator>(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn bool QJsonArray::const_iterator::operator>=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than or equal to the item pointed to by the \a other iterator.
-*/
-
-/*! \fn QJsonArray::const_iterator &QJsonArray::const_iterator::operator++()
-
-    The prefix ++ operator, \c{++it}, advances the iterator to the
-    next item in the array and returns an iterator to the new current
-    item.
-
-    Calling this function on QJsonArray::end() leads to undefined results.
-
-    \sa operator--()
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::const_iterator::operator++(int)
-
-    \overload
-
-    The postfix ++ operator, \c{it++}, advances the iterator to the
-    next item in the array and returns an iterator to the previously
-    current item.
-*/
-
-/*! \fn QJsonArray::const_iterator &QJsonArray::const_iterator::operator--()
-
-    The prefix -- operator, \c{--it}, makes the preceding item
-    current and returns an iterator to the new current item.
-
-    Calling this function on QJsonArray::begin() leads to undefined results.
-
-    \sa operator++()
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::const_iterator::operator--(int)
-
-    \overload
-
-    The postfix -- operator, \c{it--}, makes the preceding item
-    current and returns an iterator to the previously current item.
-*/
-
-/*! \fn QJsonArray::const_iterator &QJsonArray::const_iterator::operator+=(int j)
-
-    Advances the iterator by \a j items. If \a j is negative, the
-    iterator goes backward.
-
-    \sa operator-=(), operator+()
-*/
-
-/*! \fn QJsonArray::const_iterator &QJsonArray::const_iterator::operator-=(int j)
-
-    Makes the iterator go back by \a j items. If \a j is negative,
-    the iterator goes forward.
-
-    \sa operator+=(), operator-()
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::const_iterator::operator+(int j) const
-
-    Returns an iterator to the item at \a j positions forward from
-    this iterator. If \a j is negative, the iterator goes backward.
-
-    \sa operator-(), operator+=()
-*/
-
-/*! \fn QJsonArray::const_iterator QJsonArray::const_iterator::operator-(int j) const
-
-    Returns an iterator to the item at \a j positions backward from
-    this iterator. If \a j is negative, the iterator goes forward.
-
-    \sa operator+(), operator-=()
-*/
-
-/*! \fn int QJsonArray::const_iterator::operator-(const_iterator other) const
-
-    Returns the number of items between the item pointed to by \a
-    other and the item pointed to by this iterator.
-*/
-
-
-/*!
-    \internal
- */
-void QJsonArray::detach(uint reserve)
-{
-    Q_UNUSED(reserve)
-    Q_ASSERT(!reserve);
-    detach2(0);
-}
-
-/*!
-    \internal
- */
-bool QJsonArray::detach2(uint reserve)
-{
-    if (!d) {
-        if (reserve >= QJsonPrivate::Value::MaxSize) {
-            qWarning("QJson: Document too large to store in data structure");
-            return false;
-        }
-        d = new QJsonPrivate::Data(reserve, QJsonValue::Array);
-        a = static_cast<QJsonPrivate::Array *>(d->header->root());
-        d->ref.ref();
-        return true;
-    }
-    if (reserve == 0 && d->ref.load() == 1)
-        return true;
-
-    QJsonPrivate::Data *x = d->clone(a, reserve);
-    if (!x)
-        return false;
-    x->ref.ref();
-    if (!d->ref.deref())
-        delete d;
-    d = x;
-    a = static_cast<QJsonPrivate::Array *>(d->header->root());
-    return true;
-}
-
-/*!
-    \internal
- */
-void QJsonArray::compact()
-{
-    if (!d || !d->compactionCounter)
-        return;
-
-    detach2();
-    d->compact();
-    a = static_cast<QJsonPrivate::Array *>(d->header->root());
-}
-
-
-#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY)
-QDebug operator<<(QDebug dbg, const QJsonArray &a)
-{
-    QDebugStateSaver saver(dbg);
-    if (!a.a) {
-        dbg << "QJsonArray()";
-        return dbg;
-    }
-    QByteArray json;
-    QJsonPrivate::Writer::arrayToJson(a.a, json, 0, true);
-    dbg.nospace() << "QJsonArray("
-                  << json.constData() // print as utf-8 string without extra quotation marks
-                  << ")";
-    return dbg;
-}
-#endif
-
-QT_END_NAMESPACE
-
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index f68a807203..4e8e3c241e 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -315,7 +315,7 @@ void QBitArray::fill(bool value, int begin, int end)
     \since 5.11
 
     Creates a QBitArray with the dense bit array located at \a data, with \a
-    len bits. The byte array at \a data must be at least \a size / 8 (rounded up)
+    size bits. The byte array at \a data must be at least \a size / 8 (rounded up)
     bytes long.
 
     If \a size is not a multiple of 8, this function will include the lowest
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index 06373e1113..d16173df83 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -161,10 +161,26 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat
     QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions();
     while (funcs->glGetError() != GL_NO_ERROR) { }
     funcs->glProgramBinary(programId, blobFormat, p, blobSize);
-    int err = funcs->glGetError();
+
+    GLenum err = funcs->glGetError();
+    if (err != GL_NO_ERROR) {
+        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
+                                  "format 0x%x, err = 0x%x",
+                programId, blobSize, blobFormat, err);
+        return false;
+    }
+    GLint linkStatus = 0;
+    funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
+    if (linkStatus != GL_TRUE) {
+        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
+                                  "format 0x%x, linkStatus = 0x%x, err = 0x%x",
+                programId, blobSize, blobFormat, linkStatus, err);
+        return false;
+    }
+
     qCDebug(DBG_SHADER_CACHE, "Program binary set for program %u, size %d, format 0x%x, err = 0x%x",
             programId, blobSize, blobFormat, err);
-    return err == 0;
+    return true;
 }
 
 #ifdef Q_OS_UNIX
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index b044397f8e..1fe30f7e0e 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -3824,13 +3824,7 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
     bool needsCompile = true;
     if (binCache.load(cacheKey, q->programId())) {
         qCDebug(DBG_SHADER_CACHE, "Program binary received from cache");
-        linkBinaryRecursion = true;
-        bool ok = q->link();
-        linkBinaryRecursion = false;
-        if (ok)
-            needsCompile = false;
-        else
-            qCDebug(DBG_SHADER_CACHE, "Link failed after glProgramBinary");
+        needsCompile = false;
     }
 
     bool needsSave = false;
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index a5e7daff11..d4ca9c22fc 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -46,6 +46,7 @@
 #include "private/qnoncontiguousbytedevice_p.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index cbbbac85fe..e0c705f97e 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -889,7 +889,7 @@ QMap<QByteArray, QVariant> QSslConfiguration::backendConfig() const
 /*!
     \since 5.11
 
-    Sets an option in the backend-specific configuration.
+    Sets the option \a name in the backend-specific configuration to \a value.
 
     Options supported by the OpenSSL (>= 1.0.2) backend are available in the \l
     {https://www.openssl.org/docs/manmaster/man3/SSL_CONF_cmd.html#SUPPORTED-CONFIGURATION-FILE-COMMANDS}
diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h
index c8bdc1c93e..6c44541314 100644
--- a/src/plugins/platforms/windows/qtwindowsglobal.h
+++ b/src/plugins/platforms/windows/qtwindowsglobal.h
@@ -237,6 +237,7 @@ inline QtWindows::WindowsEventType windowsEventType(UINT message, WPARAM wParamI
          default:
              break;
          }
+         break;
     case WM_GETOBJECT:
         return QtWindows::AccessibleObjectFromWindowRequest;
     case WM_SETFOCUS:
diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index 8337600fa1..63c165b9dc 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -41,6 +41,7 @@
 #include <QtTest/qtestassert.h>
 
 #include <QtCore/qbytearray.h>
+#include <QtCore/qstring.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -121,6 +122,29 @@ void QAbstractTestLogger::stopLogging()
 {
 }
 
+void QAbstractTestLogger::addMessage(QtMsgType type, const QMessageLogContext &context,
+                                     const QString &message)
+{
+    QAbstractTestLogger::MessageTypes messageType = [=]() {
+        switch (type) {
+        case QtDebugMsg: return QAbstractTestLogger::QDebug;
+        case QtInfoMsg: return QAbstractTestLogger::QInfo;
+        case QtCriticalMsg: return QAbstractTestLogger::QSystem;
+        case QtWarningMsg: return QAbstractTestLogger::QWarning;
+        case QtFatalMsg: return QAbstractTestLogger::QFatal;
+        }
+        Q_UNREACHABLE();
+        return QAbstractTestLogger::QFatal;
+    }();
+
+    QString formattedMessage = qFormatLogMessage(type, context, message);
+
+    // Note that we explicitly ignore the file and line of the context here,
+    // as that's what QTest::messageHandler used to do when calling the same
+    // overload directly.
+    addMessage(messageType, formattedMessage);
+}
+
 namespace QTest
 {
 
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h
index e1fd5006b4..c4083b43f4 100644
--- a/src/testlib/qabstracttestlogger_p.h
+++ b/src/testlib/qabstracttestlogger_p.h
@@ -95,6 +95,9 @@ public:
                              const char *file = 0, int line = 0) = 0;
     virtual void addBenchmarkResult(const QBenchmarkResult &result) = 0;
 
+    virtual void addMessage(QtMsgType, const QMessageLogContext &,
+                            const QString &);
+
     virtual void addMessage(MessageTypes type, const QString &message,
                             const char *file = 0, int line = 0) = 0;
 
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 825d9d5d0e..a6797012c7 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -398,6 +398,11 @@ void QPlainTestLogger::addBenchmarkResult(const QBenchmarkResult &result)
     printBenchmarkResult(result);
 }
 
+void QPlainTestLogger::addMessage(QtMsgType type, const QMessageLogContext &context, const QString &message)
+{
+    QAbstractTestLogger::addMessage(type, context, message);
+}
+
 void QPlainTestLogger::addMessage(MessageTypes type, const QString &message,
                                   const char *file, int line)
 {
diff --git a/src/testlib/qplaintestlogger_p.h b/src/testlib/qplaintestlogger_p.h
index 93d3c7143a..55755830b2 100644
--- a/src/testlib/qplaintestlogger_p.h
+++ b/src/testlib/qplaintestlogger_p.h
@@ -71,6 +71,9 @@ public:
                      const char *file = 0, int line = 0) override;
     void addBenchmarkResult(const QBenchmarkResult &result) override;
 
+    void addMessage(QtMsgType, const QMessageLogContext &,
+                    const QString &) override;
+
     void addMessage(MessageTypes type, const QString &message,
                     const char *file = 0, int line = 0) override;
 
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 5bbf2c6458..4964c6538e 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -220,6 +220,12 @@ namespace QTest {
             FOREACH_LOGGER(logger->addBenchmarkResult(result));
         }
 
+        static void addMessage(QtMsgType type, const QMessageLogContext &context,
+                               const QString &message)
+        {
+            FOREACH_LOGGER(logger->addMessage(type, context, message));
+        }
+
         static void addMessage(QAbstractTestLogger::MessageTypes type, const QString &message,
                                const char *file = 0, int line = 0)
         {
@@ -289,11 +295,10 @@ namespace QTest {
             QTEST_ASSERT(QTest::TestLoggers::loggerCount() != 0);
         }
 
-        if (handleIgnoredMessage(type, message))
+        if (handleIgnoredMessage(type, message)) {
             // the message is expected, so just swallow it.
             return;
-
-        QString msg = qFormatLogMessage(type, context, message);
+        }
 
         if (type != QtFatalMsg) {
             if (counter.load() <= 0)
@@ -306,22 +311,10 @@ namespace QTest {
             }
         }
 
-        switch (type) {
-        case QtDebugMsg:
-            QTest::TestLoggers::addMessage(QAbstractTestLogger::QDebug, msg);
-            break;
-        case QtInfoMsg:
-            QTest::TestLoggers::addMessage(QAbstractTestLogger::QInfo, msg);
-            break;
-        case QtCriticalMsg:
-            QTest::TestLoggers::addMessage(QAbstractTestLogger::QSystem, msg);
-            break;
-        case QtWarningMsg:
-            QTest::TestLoggers::addMessage(QAbstractTestLogger::QWarning, msg);
-            break;
-        case QtFatalMsg:
-            QTest::TestLoggers::addMessage(QAbstractTestLogger::QFatal, msg);
-            /* Right now, we're inside the custom message handler and we're
+        QTest::TestLoggers::addMessage(type, context, message);
+
+        if (type == QtFatalMsg) {
+             /* Right now, we're inside the custom message handler and we're
              * being qt_message_output in qglobal.cpp. After we return from
              * this function, it will proceed with calling exit() and abort()
              * and hence crash. Therefore, we call these logging functions such
@@ -329,7 +322,6 @@ namespace QTest {
             QTestResult::addFailure("Received a fatal error.", "Unknown file", 0);
             QTestLog::leaveTestFunction();
             QTestLog::stopLogging();
-            break;
         }
     }
 }
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index cb8ac1ccbf..52ca88891e 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -1836,7 +1836,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
         "<p>Qt and the Qt logo are trademarks of The Qt Company Ltd.</p>"
         "<p>Qt is The Qt Company Ltd product developed as an open source "
         "project. See <a href=\"http://%3/\">%3</a> for more information.</p>"
-        ).arg(QStringLiteral("2017"),
+        ).arg(QStringLiteral("2018"),
               QStringLiteral("qt.io/licensing"),
               QStringLiteral("qt.io"));
     QMessageBox *msgBox = new QMessageBox(parent);
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index c90a61d4ff..b0359de3ea 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2168,15 +2168,19 @@ void QHeaderViewPrivate::_q_sectionsAboutToBeChanged()
         sectionItems[visual].size = lastSectionSize;
     }
     for (int i = 0; i < sectionItems.size(); ++i) {
-        const auto &s = sectionItems.at(i);
+        auto s = sectionItems.at(i);
         // only add if the section is not default and not visually moved
         if (s.size == defaultSectionSize && !s.isHidden && s.resizeMode == globalResizeMode)
             continue;
 
+        const int logical = logicalIndex(i);
+        if (s.isHidden)
+            s.size = hiddenSectionSize.value(logical);
+
         // ### note that we are using column or row 0
         layoutChangePersistentSections.append({orientation == Qt::Horizontal
-                                                  ? model->index(0, logicalIndex(i), root)
-                                                  : model->index(logicalIndex(i), 0, root),
+                                                  ? model->index(0, logical, root)
+                                                  : model->index(logical, 0, root),
                                               s});
 
         if (layoutChangePersistentSections.size() > 1000)
@@ -2201,6 +2205,30 @@ void QHeaderViewPrivate::_q_sectionsChanged()
         return;
     }
 
+    bool hasPersistantIndexes = false;
+    for (const auto &item : oldPersistentSections) {
+        if (item.index.isValid()) {
+            hasPersistantIndexes = true;
+            break;
+        }
+    }
+
+    // Though far from perfect we here try to retain earlier/existing behavior
+    // ### See QHeaderViewPrivate::_q_layoutAboutToBeChanged()
+    // When we don't have valid hasPersistantIndexes it can be due to
+    // - all sections are default sections
+    // - the row/column 0 which is used for persistent indexes is gone
+    // - all non-default sections were removed
+    // case one is trivial, in case two we assume nothing else changed (it's the best
+    // guess we can do - everything else can not be handled correctly for now)
+    // case three can not be handled correctly with layoutChanged - removeSections
+    // should be used instead for this
+    if (!hasPersistantIndexes) {
+        if (oldCount != newCount)
+            q->initializeSections();
+        return;
+    }
+
     // adjust section size
     if (newCount != oldCount) {
         const int min = qBound(0, oldCount, newCount - 1);