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

 Conflicts:
	tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/network/access/spdy/tst_spdy.cpp

Change-Id: I3196c5f7b34f2ffc9ef1e690d02d5b9bb3270a74

5 files changed, 33 insertions, 22 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index f9f005a83f..ea91dee471 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -139,10 +139,12 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n);
 // in. The idea here is to error or warn if otherwise implicit Qt
 // assumptions are not fulfilled on new hardware or compilers
 // (if this list becomes too long, consider factoring into a separate file)
-Q_STATIC_ASSERT_X(sizeof(int) == 4, "Qt assumes that int is 32 bits");
 Q_STATIC_ASSERT_X(UCHAR_MAX == 255, "Qt assumes that char is 8 bits");
+Q_STATIC_ASSERT_X(sizeof(int) == 4, "Qt assumes that int is 32 bits");
 Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined incorrectly");
 Q_STATIC_ASSERT_X(sizeof(float) == 4, "Qt assumes that float is 32 bits");
+Q_STATIC_ASSERT_X(sizeof(char16_t) == 2, "Qt assumes that char16_t is 16 bits");
+Q_STATIC_ASSERT_X(sizeof(char32_t) == 4, "Qt assumes that char32_t is 32 bits");
 
 // While we'd like to check for __STDC_IEC_559__, as per ISO/IEC 9899:2011
 // Annex F (C11, normative for C++11), there are a few corner cases regarding
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index 1d42dbfc70..f955e3b53a 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -403,6 +403,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
         const QString absolutePath = isDir ? fileInfo.absoluteFilePath() : fileInfo.absolutePath();
         const uint flags = isDir
                            ? (FILE_NOTIFY_CHANGE_DIR_NAME
+                              | FILE_NOTIFY_CHANGE_ATTRIBUTES
                               | FILE_NOTIFY_CHANGE_FILE_NAME)
                            : (FILE_NOTIFY_CHANGE_DIR_NAME
                               | FILE_NOTIFY_CHANGE_FILE_NAME
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index f37edfc967..581df9242c 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -118,7 +118,7 @@ public:
 
     int remainingTime(int timerId) final;
 
-    void wakeUp() final;
+    void wakeUp() override;
     void interrupt() final;
     void flush() override;
 
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index fb8f5a5efc..a3a4921690 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -463,10 +463,10 @@ QT_BEGIN_NAMESPACE
     \c{\xHHHH} with more than 2 digits. A pattern like \c{\x2022} neeeds to
     be ported to \c{\x{2022}}, or it will match a space (\c{0x20}) followed
     by the string \c{"22"}. In general, it is highly recommended to always use
-    curly braces with the \c{\\x} escape, no matter the amount of digits
+    curly braces with the \c{\x} escape, no matter the amount of digits
     specified.
 
-    \li A 0-to-n quantification like \c{{,n}} needs to be ported to c{{0,n}} to
+    \li A 0-to-n quantification like \c{{,n}} needs to be ported to \c{{0,n}} to
     preserve semantics. Otherwise, a pattern such as \c{\d{,3}} would
     actually match a digit followed by the exact string \c{"{,3}"}.
 
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index ff1152b4e9..877f5df462 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -5036,21 +5036,25 @@ bool QString::endsWith(QChar c, Qt::CaseSensitivity cs) const
 }
 
 /*!
-    Returns \c true if the string only contains uppercase letters,
-    otherwise returns \c false.
+    Returns \c true if the string is uppercase, that is, it's identical
+    to its toUpper() folding.
+
+    Note that this does \e not mean that the string does not contain
+    lowercase letters (some lowercase letters do not have a uppercase
+    folding; they are left unchanged by toUpper()).
+    For more information, refer to the Unicode standard, section 3.13.
+
     \since 5.12
 
-    \sa QChar::isUpper(), isLower()
+    \sa QChar::toUpper(), isLower()
 */
 bool QString::isUpper() const
 {
-    if (isEmpty())
-        return false;
+    QStringIterator it(*this);
 
-    const QChar *d = data();
-
-    for (int i = 0, max = size(); i < max; ++i) {
-        if (!d[i].isUpper())
+    while (it.hasNext()) {
+        uint uc = it.nextUnchecked();
+        if (qGetProp(uc)->cases[QUnicodeTables::UpperCase].diff)
             return false;
     }
 
@@ -5058,21 +5062,25 @@ bool QString::isUpper() const
 }
 
 /*!
-    Returns \c true if the string only contains lowercase letters,
-    otherwise returns \c false.
+    Returns \c true if the string is lowercase, that is, it's identical
+    to its toLower() folding.
+
+    Note that this does \e not mean that the string does not contain
+    uppercase letters (some uppercase letters do not have a lowercase
+    folding; they are left unchanged by toLower()).
+    For more information, refer to the Unicode standard, section 3.13.
+
     \since 5.12
 
-    \sa QChar::isLower(), isUpper()
+    \sa QChar::toLower(), isUpper()
  */
 bool QString::isLower() const
 {
-    if (isEmpty())
-        return false;
+    QStringIterator it(*this);
 
-    const QChar *d = data();
-
-    for (int i = 0, max = size(); i < max; ++i) {
-        if (!d[i].isLower())
+    while (it.hasNext()) {
+        uint uc = it.nextUnchecked();
+        if (qGetProp(uc)->cases[QUnicodeTables::LowerCase].diff)
             return false;
     }