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

Change-Id: Iecdf00ca61d819bde532daa42f093860ec4a499e

6 files changed, 7 insertions, 25 deletions

diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css
index 82e99c42ac..b89ca5a808 100644
--- a/doc/global/template/style/offline-simple.css
+++ b/doc/global/template/style/offline-simple.css
@@ -1,5 +1,4 @@
 pre, .LegaleseLeft {
-  background-color: #f0f0f0;
   font-family: Courier, monospace;
   font-weight: 600;
   vertical-align: top;
@@ -40,7 +39,6 @@ h1.title {
 }
 
 h2, p.h2 {
-  background-color: #F2F3F4;
   padding: 4px;
   margin: 30px 0px 20px 10px;
 }
@@ -67,10 +65,6 @@ ul li, ol li {
 }
 
 h3.fn, span.fn {
-  border-width: 3px;
-  border-style: solid;
-  border-color: #aaaaaa;
-  background-color: #eeeeee;
   word-spacing: 3px;
   padding: 5px;
   text-decoration: none;
@@ -94,10 +88,6 @@ table td {
   padding: 6px 10px 6px 10px;
 }
 
-table tr.odd {
-  background-color: #eeeeee;
-}
-
 table.qmlname td {
   padding: 0px;
   margin-left: 6px;
@@ -144,19 +134,10 @@ span.naviSeparator {
   margin: 0;
 }
 
-.navigationbar table tr {
-  background-color: #eeeeee;
-}
-
-td#buildversion {
-  background-color: #ffffff;
-}
-
 .footer, .footer p {
   padding: 5px 0px 5px 0px;
   margin: 45px 15px 5px 15px;
   font-size: 8.5pt;
-  background-color: #cccccc;
 }
 
 .footer p {
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp
index c8c5f694c6..2fa4f88011 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp
@@ -57,7 +57,7 @@ void myComplexCodeWithMultipleReturnPoints(int v)
     if (v == -1)
         return;
 
-    int v2 = code_that_might_through_exceptions();
+    int v2 = code_that_might_throw_exceptions();
 
     if (v2 == -1)
         return;
diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp
index 546f9ffe57..e222bf5514 100644
--- a/src/corelib/serialization/qcborstream.cpp
+++ b/src/corelib/serialization/qcborstream.cpp
@@ -1950,7 +1950,7 @@ inline void QCborStreamReader::preparse()
             // for negative integer and we don't have separate types for Boolean,
             // Null and Undefined).
             if (type_ == CborBooleanType || type_ == CborNullType || type_ == CborUndefinedType) {
-                type_ = SimpleType;
+                type_ = CborSimpleType;
                 value64 = quint8(d->buffer.at(d->bufferStart)) - CborSimpleType;
             } else {
                 // Using internal TinyCBOR API!
diff --git a/src/corelib/tools/qscopeguard.qdoc b/src/corelib/tools/qscopeguard.qdoc
index 70e13ab2fd..21b0bab9cf 100644
--- a/src/corelib/tools/qscopeguard.qdoc
+++ b/src/corelib/tools/qscopeguard.qdoc
@@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE
     \class QScopeGuard
     \since 5.12
     \inmodule QtCore
-    \brief Provides a scope guard for calling a function at the of
+    \brief Provides a scope guard for calling a function at the end of
            a scope.
 */
 
diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm
index fff66049ff..535e7d7aa6 100644
--- a/src/plugins/platforms/ios/qioscontext.mm
+++ b/src/plugins/platforms/ios/qioscontext.mm
@@ -306,7 +306,7 @@ bool QIOSContext::verifyGraphicsHardwareAvailability()
                 Q_UNUSED(oldState);
                 if (applicationBackgrounded && newState != Qt::ApplicationSuspended) {
                     qCDebug(lcQpaGLContext) << "app no longer backgrounded, rendering enabled";
-                    applicationBackgrounded = true;
+                    applicationBackgrounded = false;
                 }
             }
         );
@@ -317,6 +317,7 @@ bool QIOSContext::verifyGraphicsHardwareAvailability()
                     return;
 
                 qCDebug(lcQpaGLContext) << "app backgrounded, rendering disabled";
+                applicationBackgrounded = true;
 
                 // By the time we receive this signal the application has moved into
                 // Qt::ApplactionStateSuspended, and all windows have been obscured,
diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST
index c0dfe5eb86..f9bc0af6de 100644
--- a/tests/auto/network/ssl/qsslkey/BLACKLIST
+++ b/tests/auto/network/ssl/qsslkey/BLACKLIST
@@ -1,2 +1,2 @@
-redhatenterpriselinuxworkstation-6.6
-rhel-7.4
+redhatenterpriselinuxworkstation
+rhel