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

 Conflicts:
	qmake/generators/makefile.cpp

Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d

1 files changed, 0 insertions, 19 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 009074a5f3..9a2f19c2f2 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -215,25 +215,6 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
 
     connect(qGuiApp, &QGuiApplication::focusWindowChanged,
         this, &QCocoaIntegration::focusWindowChanged);
-
-    static auto splashScreenHider = QMacKeyValueObserver(NSApp, @"modalWindow", []{
-        const QWindowList allWindows = QGuiApplication::topLevelWindows();
-        for (QWindow *window : allWindows) {
-            if ((window->flags() & Qt::SplashScreen) == Qt::SplashScreen) {
-                QCocoaWindow *platformWindow = static_cast<QCocoaWindow*>(window->handle());
-                NSWindow *splashWindow = platformWindow->view().window;
-                if (!splashWindow)
-                    continue;
-                if (NSApp.modalWindow) {
-                    NSInteger originalLevel = splashWindow.level;
-                    splashWindow.level = NSNormalWindowLevel;
-                    window->setProperty("_q_levelBeforeModalSession", (qlonglong)originalLevel);
-                } else if (NSInteger originalLevel = window->property("_q_levelBeforeModalSession").toLongLong()) {
-                    splashWindow.level = originalLevel;
-                }
-            }
-        }
-    });
 }
 
 QCocoaIntegration::~QCocoaIntegration()