4 files changed, 28 insertions, 3 deletions
diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
index ac0cfcf2f5..4fbe6bba3f 100644
--- a/src/widgets/kernel/qdesktopwidget.cpp
+++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -111,7 +111,7 @@ const QRect QDesktopWidgetPrivate::availableGeometry(const QWidget *widget)
 QDesktopScreenWidget *QDesktopWidgetPrivate::widgetForScreen(QScreen *qScreen) const
 {
     foreach (QDesktopScreenWidget *widget, screens) {
-        if (widget->screen() == qScreen)
+        if (widget->assignedScreen() == qScreen)
             return widget;
     }
     return nullptr;
diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h
index 69f87337b3..63949055aa 100644
--- a/src/widgets/kernel/qdesktopwidget_p.h
+++ b/src/widgets/kernel/qdesktopwidget_p.h
@@ -68,7 +68,7 @@ public:
     int screenNumber() const;
     void setScreenGeometry(const QRect &geometry);
 
-    QScreen *screen() const { return m_screen.data(); }
+    QScreen *assignedScreen() const { return m_screen.data(); }
     QRect screenGeometry() const { return m_geometry; }
 
 private:
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 0a7566614b..e286782d6f 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2445,7 +2445,7 @@ WId QWidget::effectiveWinId() const
 
     \since 5.0
 
-    \sa winId()
+    \sa winId(), screen()
 */
 QWindow *QWidget::windowHandle() const
 {
@@ -2453,6 +2453,29 @@ QWindow *QWidget::windowHandle() const
     return d->windowHandle();
 }
 
+/*!
+    Returns the screen the widget is on.
+
+    \since 5.14
+
+    \sa windowHandle()
+*/
+QScreen *QWidget::screen() const
+{
+    Q_D(const QWidget);
+    if (auto associatedScreen = d->associatedScreen())
+        return associatedScreen;
+    if (auto topLevel = window()) {
+        if (auto topData = qt_widget_private(topLevel)->topData()) {
+            if (auto initialScreen = QGuiApplicationPrivate::screen_list.value(topData->initialScreenIndex))
+                return initialScreen;
+        }
+        if (auto screenByPos = QGuiApplication::screenAt(topLevel->geometry().center()))
+            return screenByPos;
+    }
+    return QGuiApplication::primaryScreen();
+}
+
 #ifndef QT_NO_STYLE_STYLESHEET
 
 /*!
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index f7ec7f9cf1..83a6e6d4b3 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -85,6 +85,7 @@ class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
+class QScreen;
 class QShowEvent;
 class QHideEvent;
 class QIcon;
@@ -601,6 +602,7 @@ public:
     QBackingStore *backingStore() const;
 
     QWindow *windowHandle() const;
+    QScreen *screen() const;
 
     static QWidget *createWindowContainer(QWindow *window, QWidget *parent=nullptr, Qt::WindowFlags flags=Qt::WindowFlags());