6 files changed, 21 insertions, 11 deletions
diff --git a/src/corelib/tools/qcollator_icu.cpp b/src/corelib/tools/qcollator_icu.cpp
index 407a493d25..23e88b5015 100644
--- a/src/corelib/tools/qcollator_icu.cpp
+++ b/src/corelib/tools/qcollator_icu.cpp
@@ -75,10 +75,17 @@ void QCollator::setCaseSensitivity(Qt::CaseSensitivity cs)
 {
     detach();
 
-    UColAttributeValue val = (cs == Qt::CaseSensitive) ? UCOL_UPPER_FIRST : UCOL_OFF;
+    // The strength attribute in ICU is rather badly documented. Basically UCOL_PRIMARY
+    // ignores differences between base characters and accented characters as well as case.
+    // So A and A-umlaut would compare equal.
+    // UCOL_SECONDARY ignores case differences. UCOL_TERTIARY is the default in most languages
+    // and does case sensitive comparison.
+    // UCOL_QUATERNARY is used as default in a few languages such as Japanese to take care of some
+    // additional differences in those languages.
+    UColAttributeValue val = (cs == Qt::CaseSensitive) ? UCOL_DEFAULT_STRENGTH : UCOL_SECONDARY;
 
     UErrorCode status = U_ZERO_ERROR;
-    ucol_setAttribute(d->collator, UCOL_CASE_FIRST, val, &status);
+    ucol_setAttribute(d->collator, UCOL_STRENGTH, val, &status);
     if (U_FAILURE(status))
         qWarning("ucol_setAttribute: Case First failed: %d", status);
 }
diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp
index 8985cd4eba..877510489a 100644
--- a/src/corelib/tools/qcollator_macx.cpp
+++ b/src/corelib/tools/qcollator_macx.cpp
@@ -128,12 +128,15 @@ bool QCollator::ignorePunctuation() const
 int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
 {
     SInt32 result;
-    return UCCompareText(d->collator.collator,
+    Boolean equivalent;
+    UCCompareText(d->collator.collator,
                          reinterpret_cast<const UniChar *>(s1), len1,
                          reinterpret_cast<const UniChar *>(s2), len2,
-                         NULL,
+                         &equivalent,
                          &result);
-    return result;
+    if (equivalent)
+        return 0;
+    return result < 0 ? -1 : 1;
 }
 int QCollator::compare(const QString &str1, const QString &str2) const
 {
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index b17c6d2f40..5d25b0add1 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -90,7 +90,7 @@ public:
 
         // special case: it is in the first buffer
         int nextDataBlockSizeValue = nextDataBlockSize();
-        if (pos - head < nextDataBlockSizeValue) {
+        if (pos < nextDataBlockSizeValue) {
             length = nextDataBlockSizeValue - pos;
             return buffers.at(0).constData() + head + pos;
         }
diff --git a/src/corelib/tools/qscopedvaluerollback.cpp b/src/corelib/tools/qscopedvaluerollback.cpp
index f37a232985..bd3e03c464 100644
--- a/src/corelib/tools/qscopedvaluerollback.cpp
+++ b/src/corelib/tools/qscopedvaluerollback.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \since 4.8
     \ingroup misc
 
-    The QScopedAssignment class can be used to revert state when an
+    The QScopedValueRollback class can be used to revert state when an
     exception is thrown without needing to write try-catch blocks.
 
     It can also be used to manage variables that are temporarily set,
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 8ce7b63f46..19a1943367 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -220,8 +220,10 @@
     || (defined(Q_CC_CLANG) && (__clang_major__ * 100 + __clang_minor__ >= 208)) \
     || defined(Q_CC_INTEL))
 #  define QT_COMPILER_SUPPORTS_X86INTRIN
-#  ifndef Q_CC_INTEL
+#  ifdef Q_CC_INTEL
 // The Intel compiler has no <x86intrin.h> -- all intrinsics are in <immintrin.h>;
+#    include <immintrin.h>
+#  else
 // GCC 4.4 and Clang 2.8 added a few more intrinsics there
 #    include <x86intrin.h>
 #  endif
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index a7f932698b..7aaddb9b52 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -9894,9 +9894,7 @@ QString QString::toHtmlEscaped() const
   the read-only segment of the compiled object file.
 
   For compilers not supporting the creation of compile time strings, QStringLiteral will fall back to
-  QLatin1String.
-
-  The result of the QStringLiteral expression can be cast into a QString.
+  QString::fromUtf8().
 
   If you have code looking like:
   \code