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

 Conflicts:
	src/android/templates/AndroidManifest.xml
	tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp

Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9

2 files changed, 3 insertions, 1 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 055455c431..3f0b78ec55 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2050,6 +2050,8 @@ static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSyst
             return "Sierra";
         case 13:
             return "High Sierra";
+        case 14:
+            return "Mojave";
         }
     }
     // unknown, future version
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
index c762da80d3..4a225b2599 100644
--- a/src/corelib/global/qnumeric_p.h
+++ b/src/corelib/global/qnumeric_p.h
@@ -348,7 +348,7 @@ template <> inline bool mul_overflow(qint64 v1, qint64 v2, qint64 *r)
     // as signed for the low bits and use a signed right shift to verify that
     // 'high' is nothing but sign bits that match the sign of 'low'.
 
-    qint64 high = __mulh(v1, v2);
+    qint64 high = Q_SMULH(v1, v2);
     *r = qint64(quint64(v1) * quint64(v2));
     return (*r >> 63) != high;
 }