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

 Conflicts:
	mkspecs/common/macx.conf

Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209

6 files changed, 15 insertions, 27 deletions

diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index 40d6c8b7c3..ad1885e8ce 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
 
     The QRect class provides a collection of functions that return the
     various rectangle coordinates, and enable manipulation of
-    these. QRect also provide functions to move the rectangle relative
+    these. QRect also provides functions to move the rectangle relative
     to the various coordinates. In addition there is a moveTo()
     function that moves the rectangle, leaving its top left corner at
     the given coordinates. Alternatively, the translate() function
@@ -155,7 +155,7 @@ QT_BEGIN_NAMESPACE
 
     The QRect class provides a collection of functions that return the
     various rectangle coordinates, and enable manipulation of
-    these. QRect also provide functions to move the rectangle relative
+    these. QRect also provides functions to move the rectangle relative
     to the various coordinates.
 
     For example the left(), setLeft() and moveLeft() functions as an
@@ -1335,7 +1335,7 @@ QDebug operator<<(QDebug dbg, const QRect &r)
 
     The QRectF class provides a collection of functions that return
     the various rectangle coordinates, and enable manipulation of
-    these. QRectF also provide functions to move the rectangle
+    these. QRectF also provides functions to move the rectangle
     relative to the various coordinates. In addition there is a
     moveTo() function that moves the rectangle, leaving its top left
     corner at the given coordinates. Alternatively, the translate()
@@ -1418,7 +1418,7 @@ QDebug operator<<(QDebug dbg, const QRect &r)
 
     The QRectF class provides a collection of functions that return
     the various rectangle coordinates, and enable manipulation of
-    these. QRectF also provide functions to move the rectangle
+    these. QRectF also provides functions to move the rectangle
     relative to the various coordinates.
 
     For example: the bottom(), setBottom() and moveBottom() functions:
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
index 3680b3c3c2..001cb839fa 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -1817,6 +1817,7 @@ void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat gly
             // we may have to re-bind brush textures after filling in the cache.
             brushTextureDirty = (QT_BRUSH_TEXTURE_UNIT == glypchCacheTextureUnit);
         }
+        cache->setPaintEnginePrivate(nullptr);
     }
 
     if (cache->width() == 0 || cache->height() == 0)
diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h
index 0b7b5f6082..598cb00ee5 100644
--- a/src/gui/opengl/qopengltextureglyphcache_p.h
+++ b/src/gui/opengl/qopengltextureglyphcache_p.h
@@ -152,6 +152,11 @@ public:
 
     void clear();
 
+    QOpenGL2PaintEngineExPrivate *paintEnginePrivate() const
+    {
+        return pex;
+    }
+
 private:
     void setupVertexAttribs();
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 0f87109ada..612290c9bd 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -72,12 +72,6 @@
 
 #include <IOKit/graphics/IOGraphicsLib.h>
 
-#if !QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
-@interface NSApplication (MojaveForwardDeclarations)
-@property (strong) NSAppearance *appearance NS_AVAILABLE_MAC(10_14);
-@end
-#endif
-
 static void initResources()
 {
     Q_INIT_RESOURCE(qcocoaresources);
@@ -139,21 +133,6 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
     NSApplication *cocoaApplication = [QNSApplication sharedApplication];
     qt_redirectNSApplicationSendEvent();
 
-    if (__builtin_available(macOS 10.14, *)) {
-        // Disable dark appearance, unless the Info.plist or environment requests that it should be enabled
-        bool plistEnablesDarkAppearance = [[[NSBundle mainBundle] objectForInfoDictionaryKey:
-            @"NSRequiresAquaSystemAppearance"] boolValue];
-
-        bool hasEnvironmentRequiresAquaAppearance;
-        int environmentRequiresAquaAppearance = qEnvironmentVariableIntValue(
-            "QT_MAC_REQUIRES_AQUA_SYSTEM_APPEARANCE", &hasEnvironmentRequiresAquaAppearance);
-        bool environmentEnablesDarkAppearance = hasEnvironmentRequiresAquaAppearance
-            && environmentRequiresAquaAppearance == 0;
-
-        if (!(plistEnablesDarkAppearance || environmentEnablesDarkAppearance))
-            NSApp.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
-    }
-
     if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) {
         // Applications launched from plain executables (without an app
         // bundle) are "background" applications that does not take keybaord
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index 98ee90deb7..0b64b2a2bb 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -165,6 +165,11 @@ void QMacCocoaViewContainer::setCocoaView(NSView *view)
     Q_ASSERT(window->handle());
 
     [oldView release];
+
+    // The QWindow::destroy()) call above will explicitly hide this widget.
+    // Clear the hidden state here so it can be implicitly shown again.
+    setAttribute(Qt::WA_WState_Hidden, false);
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 17f87804e9..91796106a2 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -6666,8 +6666,6 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt
 }
 
 /*!
-    \nonreentrant
-
     This function parses the XML document from the byte array \a
     data and sets it as the content of the document. It tries to
     detect the encoding of the document as required by the XML