5 files changed, 78 insertions, 27 deletions

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index e73c63f657..9a0e969e1c 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -862,6 +862,16 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     when the choice is not changed. If you need to know when the
     choice actually changes, use signal currentIndexChanged().
 
+    \obsolete Use QComboBox::textActivated() instead
+*/
+/*!
+    \fn void QComboBox::textActivated(const QString &text)
+    \since 5.14
+
+    This signal is sent when the user chooses an item in the combobox.
+    The item's \a text is passed. Note that this signal is sent even
+    when the choice is not changed. If you need to know when the
+    choice actually changes, use signal currentIndexChanged().
 */
 
 /*!
@@ -876,6 +886,15 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
 
     This signal is sent when an item in the combobox popup list is
     highlighted by the user. The item's \a text is passed.
+
+    \obsolete Use textHighlighted() instead
+*/
+/*!
+    \fn void QComboBox::textHighlighted(const QString &text)
+    \since 5.14
+
+    This signal is sent when an item in the combobox popup list is
+    highlighted by the user. The item's \a text is passed.
 */
 
 /*!
@@ -888,7 +907,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     currentIndex was reset.
 */
 
-#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn void QComboBox::currentIndexChanged(const QString &text)
     \since 4.1
@@ -897,7 +915,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     changes either through user interaction or programmatically.  The
     item's \a text is passed.
 */
-#endif
 
 /*!
     \fn void QComboBox::currentTextChanged(const QString &text)
@@ -2522,21 +2539,6 @@ QSize QComboBox::sizeHint() const
 }
 
 #ifdef Q_OS_MAC
-
-namespace {
-struct IndexSetter {
-    int index;
-    QComboBox *cb;
-
-    void operator()(void)
-    {
-        cb->setCurrentIndex(index);
-        emit cb->activated(index);
-        emit cb->activated(cb->itemText(index));
-    }
-};
-}
-
 void QComboBoxPrivate::cleanupNativePopup()
 {
     if (!m_platformMenu)
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index eadb21628f..5967776a61 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -390,6 +390,16 @@ public:
 #ifdef Q_OS_MAC
     void cleanupNativePopup();
     bool showNativePopup();
+    struct IndexSetter {
+        int index;
+        QComboBox *cb;
+
+        void operator()(void)
+        {
+            cb->setCurrentIndex(index);
+            cb->d_func()->emitActivated(cb->d_func()->currentIndex);
+        }
+    };
 #endif
 
     QAbstractItemModel *model;
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index e38490dabd..51b458f03a 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -2332,14 +2332,17 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     // However if the QMenu was constructed with a QDesktopScreenWidget as its parent,
     // then initialScreenIndex was set, so we should respect that for the lifetime of this menu.
     // Use d->popupScreen to remember, because initialScreenIndex will be reset after the first showing.
-    const int screenIndex = d->topData()->initialScreenIndex;
-    if (screenIndex >= 0)
-        d->popupScreen = screenIndex;
-    if (auto s = QGuiApplication::screens().value(d->popupScreen)) {
-        if (d->setScreen(s))
+    // However if eventLoop exists, then exec() already did this by calling createWinId(); so leave it alone. (QTBUG-76162)
+    if (!d->eventLoop) {
+        const int screenIndex = d->topData()->initialScreenIndex;
+        if (screenIndex >= 0)
+            d->popupScreen = screenIndex;
+        if (auto s = QGuiApplication::screens().value(d->popupScreen)) {
+            if (d->setScreen(s))
+                d->itemsDirty = true;
+        } else if (d->setScreenForPoint(p)) {
             d->itemsDirty = true;
-    } else if (d->setScreenForPoint(p)) {
-        d->itemsDirty = true;
+        }
     }
 
     const bool contextMenu = d->isContextMenu();
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
index e39ef6d1cd..b7c3426e08 100644
--- a/src/widgets/widgets/qsplashscreen.cpp
+++ b/src/widgets/widgets/qsplashscreen.cpp
@@ -123,6 +123,11 @@ public:
    wish to do your own drawing you can get a pointer to the pixmap
    used in the splash screen with pixmap().  Alternatively, you can
    subclass QSplashScreen and reimplement drawContents().
+
+   In case of having multiple screens, it is also possible to show the
+   splash screen on a different screen than the primary one. For example:
+
+   \snippet qsplashscreen/main.cpp 2
 */
 
 /*!
@@ -139,6 +144,23 @@ QSplashScreen::QSplashScreen(const QPixmap &pixmap, Qt::WindowFlags f)
 
 /*!
     \overload
+    \since 5.15
+
+    This function allows you to specify the screen for your splashscreen. The
+    typical use for this constructor is if you have multiple screens and
+    prefer to have the splash screen on a different screen than your primary
+    one. In that case pass the proper \a screen.
+*/
+QSplashScreen::QSplashScreen(QScreen *screen, const QPixmap &pixmap, Qt::WindowFlags f)
+    : QWidget(*(new QSplashScreenPrivate()), nullptr, Qt::SplashScreen | Qt::FramelessWindowHint | f)
+{
+    d_func()->setPixmap(pixmap, screen);
+}
+
+#if QT_DEPRECATED_SINCE(5, 15)
+/*!
+    \overload
+    \obsolete
 
     This function allows you to specify a parent for your splashscreen. The
     typical use for this constructor is if you have a multiple screens and
@@ -152,6 +174,7 @@ QSplashScreen::QSplashScreen(QWidget *parent, const QPixmap &pixmap, Qt::WindowF
     // is still 0 here due to QWidget's special handling.
     d_func()->setPixmap(pixmap, QSplashScreenPrivate::screenFor(parent));
 }
+#endif
 
 /*!
   Destructor.
@@ -286,26 +309,35 @@ void QSplashScreen::setPixmap(const QPixmap &pixmap)
 }
 
 // In setPixmap(), resize and try to position on a screen according to:
-// 1) If a QDesktopScreenWidget is found in the parent hierarchy, use that (see docs on
+// 1) If the screen for the given widget is available, use that
+// 2) If a QDesktopScreenWidget is found in the parent hierarchy, use that (see docs on
 //    QSplashScreen(QWidget *, QPixmap).
-// 2) If a widget with associated QWindow is found, use that
-// 3) When nothing can be found, try to center it over the cursor
+// 3) If a widget with associated QWindow is found, use that
+// 4) When nothing can be found, try to center it over the cursor
 
+#if QT_DEPRECATED_SINCE(5, 15)
 static inline int screenNumberOf(const QDesktopScreenWidget *dsw)
 {
     auto desktopWidgetPrivate =
         static_cast<QDesktopWidgetPrivate *>(qt_widget_private(QApplication::desktop()));
     return desktopWidgetPrivate->screens.indexOf(const_cast<QDesktopScreenWidget *>(dsw));
 }
+#endif
 
 const QScreen *QSplashScreenPrivate::screenFor(const QWidget *w)
 {
+    if (w && w->screen())
+        return w->screen();
+
     for (const QWidget *p = w; p !=nullptr ; p = p->parentWidget()) {
+#if QT_DEPRECATED_SINCE(5, 15)
         if (auto dsw = qobject_cast<const QDesktopScreenWidget *>(p))
             return QGuiApplication::screens().value(screenNumberOf(dsw));
+#endif
         if (QWindow *window = p->windowHandle())
             return window->screen();
     }
+
 #if QT_CONFIG(cursor)
     // Note: We could rely on QPlatformWindow::initialGeometry() to center it
     // over the cursor, but not all platforms (namely Android) use that.
diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h
index 8bdf4e7749..1877493fcf 100644
--- a/src/widgets/widgets/qsplashscreen.h
+++ b/src/widgets/widgets/qsplashscreen.h
@@ -55,7 +55,11 @@ class Q_WIDGETS_EXPORT QSplashScreen : public QWidget
     Q_OBJECT
 public:
     explicit QSplashScreen(const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags());
+    QSplashScreen(QScreen *screen, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags());
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_VERSION_X_5_15("Use the constructor taking a QScreen *")
     QSplashScreen(QWidget *parent, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags());
+#endif
     virtual ~QSplashScreen();
 
     void setPixmap(const QPixmap &pixmap);