Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

6 files changed, 8 insertions, 11 deletions

diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index af36bd7e2f..8561f908b9 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -930,6 +930,7 @@ QString QUtf32::convertToUnicode(const char *chars, int len, QTextCodec::Convert
         tuple[num++] = *chars++;
         if (num == 4) {
             if (!headerdone) {
+                headerdone = true;
                 if (endian == DetectEndianness) {
                     if (tuple[0] == 0xff && tuple[1] == 0xfe && tuple[2] == 0 && tuple[3] == 0 && endian != BigEndianness) {
                         endian = LittleEndianness;
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index def4a1095f..104161bc33 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -4192,7 +4192,7 @@ static bool isIp6(const QString &text)
 
 /*!
     Returns a valid URL from a user supplied \a userInput string if one can be
-    deducted. In the case that is not possible, an invalid QUrl() is returned.
+    deduced. In the case that is not possible, an invalid QUrl() is returned.
 
     This overload takes a \a workingDirectory path, in order to be able to
     handle relative paths. This is especially useful when handling command
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 21303549ab..61d37d5062 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -3055,12 +3055,8 @@ bool QSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &
     Returns \c true if the item in the column indicated by the given \a source_column
     and \a source_parent should be included in the model; otherwise returns \c false.
 
-    The default implementation returns \c true if the value held by the relevant item
-    matches the filter string, wildcard string or regular expression.
-
-    \note By default, the Qt::DisplayRole is used to determine if the column
-    should be accepted or not. This can be changed by setting the \l
-    filterRole property.
+    \note The default implementation always returns \c true. You must reimplement this
+    method to get the described behavior.
 
     \sa filterAcceptsRow(), setFilterFixedString(), setFilterRegExp(), setFilterWildcard()
 */
diff --git a/src/corelib/text/qharfbuzz.cpp b/src/corelib/text/qharfbuzz.cpp
index a3e266ccd2..f54ce26206 100644
--- a/src/corelib/text/qharfbuzz.cpp
+++ b/src/corelib/text/qharfbuzz.cpp
@@ -72,7 +72,7 @@ HB_UChar16 HB_GetMirroredChar(HB_UChar16 ch)
 
 void (*HB_Library_Resolve(const char *library, int version, const char *symbol))()
 {
-#if !QT_CONFIG(library)
+#if !QT_CONFIG(library) || defined(Q_OS_WASM)
     Q_UNUSED(library);
     Q_UNUSED(version);
     Q_UNUSED(symbol);
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 1f4e856660..61325c7486 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1124,7 +1124,7 @@ int QStringView::toWCharArray(wchar_t *array) const
     if (sizeof(wchar_t) == sizeof(QChar)) {
         if (auto src = data())
             memcpy(array, src, sizeof(QChar) * size());
-        return size();
+        return int(size());     // ### q6sizetype
     } else {
         return QString::toUcs4_helper(reinterpret_cast<const ushort *>(data()), int(size()),
                                       reinterpret_cast<uint *>(array));
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h
index 64c6b4d326..14fbc34b9d 100644
--- a/src/corelib/tools/qlinkedlist.h
+++ b/src/corelib/tools/qlinkedlist.h
@@ -70,14 +70,14 @@ QT_WARNING_DISABLE_DEPRECATED
 
 QT_BEGIN_NAMESPACE
 
-struct QT_DEPRECATED_VERSION_5_15 Q_CORE_EXPORT QLinkedListData
+struct QT_DEPRECATED_VERSION_5_15 QLinkedListData
 {
     QLinkedListData *n, *p;
     QtPrivate::RefCount ref;
     int size;
     uint sharable : 1;
 
-    static const QLinkedListData shared_null;
+    Q_CORE_EXPORT static const QLinkedListData shared_null;
 };
 
 template <typename T>