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

 Conflicts:
	qmake/generators/makefile.cpp

Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d

6 files changed, 210 insertions, 29 deletions

diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index 083b7c1655..02e00039ae 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -6,6 +6,7 @@ SOURCES += main.mm \
     qcocoatheme.mm \
     qcocoabackingstore.mm \
     qcocoawindow.mm \
+    qcocoawindowmanager.mm \
     qnsview.mm \
     qnswindow.mm \
     qnswindowdelegate.mm \
@@ -41,6 +42,7 @@ HEADERS += qcocoaintegration.h \
     qcocoatheme.h \
     qcocoabackingstore.h \
     qcocoawindow.h \
+    qcocoawindowmanager.h \
     qnsview.h \
     qnswindow.h \
     qnswindowdelegate.h \
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()
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
index 464c16d66f..db64702b8d 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -118,11 +118,13 @@ class QSystemTrayIconSys
 public:
     QSystemTrayIconSys(QCocoaSystemTrayIcon *sys) {
         item = [[QNSStatusItem alloc] initWithSysTray:sys];
-        [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:item];
+        NSUserNotificationCenter.defaultUserNotificationCenter.delegate = item;
     }
     ~QSystemTrayIconSys() {
         [[[item item] view] setHidden: YES];
-        [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:nil];
+        NSUserNotificationCenter *center = NSUserNotificationCenter.defaultUserNotificationCenter;
+        if (center.delegate == item)
+            center.delegate = nil;
         [item release];
     }
     QNSStatusItem *item;
@@ -277,7 +279,10 @@ void QCocoaSystemTrayIcon::showMessage(const QString &title, const QString &mess
         notification.contentImage = [nsimage autorelease];
     }
 
-    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+    NSUserNotificationCenter *center = NSUserNotificationCenter.defaultUserNotificationCenter;
+    center.delegate = m_sys->item;
+    [center deliverNotification:notification];
+    [notification release];
 }
 QT_END_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 363a026e71..26df604f1c 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -454,13 +454,35 @@ NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags)
     if (type == Qt::ToolTip)
         windowLevel = NSScreenSaverWindowLevel;
 
-    // Any "special" window should be in at least the same level as its parent.
-    if (type != Qt::Window) {
-        const QWindow * const transientParent = window()->transientParent();
-        const QCocoaWindow * const transientParentWindow = transientParent ?
-                    static_cast<QCocoaWindow *>(transientParent->handle()) : nullptr;
-        if (transientParentWindow)
-            windowLevel = qMax([transientParentWindow->nativeWindow() level], windowLevel);
+    auto *transientParent = window()->transientParent();
+    if (transientParent && transientParent->handle()) {
+        // We try to keep windows in at least the same window level as
+        // their transient parent. Unfortunately this only works when the
+        // window is created. If the window level changes after that, as
+        // a result of a call to setWindowFlags, or by changing the level
+        // of the native window, we will not pick this up, and the window
+        // will be left behind (or in a different window level than) its
+        // parent. We could KVO-observe the window level of our transient
+        // parent, but that requires us to know when the parent goes away
+        // so that we can unregister the observation before the parent is
+        // dealloced, something we can't do for generic NSWindows. Another
+        // way would be to override [NSWindow setLevel:] and notify child
+        // windows about the change, but that doesn't work for foreign
+        // windows, which can still be transient parents via fromWinId().
+        // One area where this problem is apparent is when AppKit tweaks
+        // the window level of modal windows during application activation
+        // and deactivation. Since we don't pick up on these window level
+        // changes in a generic way, we need to add logic explicitly to
+        // re-evaluate the window level after AppKit has done its tweaks.
+
+        auto *transientCocoaWindow = static_cast<QCocoaWindow *>(transientParent->handle());
+        auto *nsWindow = transientCocoaWindow->nativeWindow();
+
+        // We only upgrade the window level for "special" windows, to work
+        // around Qt Designer parenting the designer windows to the widget
+        // palette window (QTBUG-31779). This should be fixed in designer.
+        if (type != Qt::Window)
+            windowLevel = qMax(windowLevel, nsWindow.level);
     }
 
     return windowLevel;
diff --git a/src/plugins/platforms/cocoa/qcocoawindowmanager.h b/src/plugins/platforms/cocoa/qcocoawindowmanager.h
new file mode 100644
index 0000000000..54f17eeccd
--- /dev/null
+++ b/src/plugins/platforms/cocoa/qcocoawindowmanager.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOCOAWINDOWMANAGER_H
+#define QCOCOAWINDOWMANAGER_H
+
+#include <QtCore/qglobal.h>
+
+#include <AppKit/AppKit.h>
+
+QT_BEGIN_NAMESPACE
+
+class QCocoaWindowManager
+{
+public:
+    static QCocoaWindowManager *instance();
+
+private:
+    QCocoaWindowManager();
+    void initialize();
+
+    void modalSessionChanged();
+};
+
+QT_END_NAMESPACE
+
+#endif // QCOCOAWINDOWMANAGER_H
diff --git a/src/plugins/platforms/cocoa/qcocoawindowmanager.mm b/src/plugins/platforms/cocoa/qcocoawindowmanager.mm
new file mode 100644
index 0000000000..879bfaa546
--- /dev/null
+++ b/src/plugins/platforms/cocoa/qcocoawindowmanager.mm
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qcocoawindowmanager.h"
+#include "qcocoawindow.h"
+
+#include <QtCore/private/qcore_mac_p.h>
+
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qwindow.h>
+
+QT_BEGIN_NAMESPACE
+
+QCocoaWindowManager *QCocoaWindowManager::instance()
+{
+    static auto *instance = new QCocoaWindowManager;
+    return instance;
+}
+
+QCocoaWindowManager::QCocoaWindowManager()
+{
+    if (NSApp) {
+        initialize();
+    } else {
+        static auto applicationDidFinishLaunching(QMacNotificationObserver(nil,
+            NSApplicationDidFinishLaunchingNotification, [this] { initialize(); }));
+    }
+}
+
+void QCocoaWindowManager::initialize()
+{
+    Q_ASSERT(NSApp);
+
+    // Whenever the modalWindow property of NSApplication changes we have a new
+    // modal session running. Observing the app modal window instead of our own
+    // event dispatcher sessions allows us to track session started by native
+    // APIs as well. We need to check the initial state as well, in case there
+    // is already a modal session running.
+    static auto modalSessionObserver(QMacKeyValueObserver(
+        NSApp, @"modalWindow", [this] { modalSessionChanged(); },
+        NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew));
+}
+
+void QCocoaWindowManager::modalSessionChanged()
+{
+    // Make sure that no window is overlapping the modal window. This can
+    // happen for e.g. splash screens, which have the NSPopUpMenuWindowLevel.
+    for (auto *window : QGuiApplication::topLevelWindows()) {
+        auto *platformWindow = static_cast<QCocoaWindow*>(window->handle());
+        if (!platformWindow)
+            continue;
+
+        auto naturalWindowLevel = platformWindow->windowLevel(window->flags());
+        if (naturalWindowLevel > NSModalPanelWindowLevel) {
+            NSWindow *nativeWindow = platformWindow->nativeWindow();
+            if (NSApp.modalWindow) {
+                // Lower window to that of the modal windows, but no less
+                nativeWindow.level = NSModalPanelWindowLevel;
+                [nativeWindow orderBack:nil];
+            } else {
+                // Restore window's natural window level, whatever that was
+                nativeWindow.level = naturalWindowLevel;
+            }
+        }
+    }
+}
+
+static void initializeWindowManager() { Q_UNUSED(QCocoaWindowManager::instance()); }
+Q_CONSTRUCTOR_FUNCTION(initializeWindowManager)
+
+QT_END_NAMESPACE
+