1 files changed, 22 insertions, 14 deletions

diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
index 5fb7882932..ac0cfcf2f5 100644
--- a/src/widgets/kernel/qdesktopwidget.cpp
+++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -176,26 +176,32 @@ void QDesktopWidgetPrivate::_q_updateScreens()
         // Notice that we trigger screenCountChanged even if a screen was removed and another one added,
         // in which case the total number of screens did not change. This is the only way for applications
         // to notice that a screen was swapped out against another one.
+#if QT_DEPRECATED_SINCE(5, 11)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         emit q->screenCountChanged(targetLength);
 QT_WARNING_POP
+#endif
     }
+#if QT_DEPRECATED_SINCE(5, 11)
     foreach (int changedScreen, changedScreens)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         emit q->resized(changedScreen);
 QT_WARNING_POP
+#endif
 }
 
 void QDesktopWidgetPrivate::_q_availableGeometryChanged()
 {
+#if QT_DEPRECATED_SINCE(5, 11)
     Q_Q(QDesktopWidget);
     if (QScreen *screen = qobject_cast<QScreen *>(q->sender()))
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         emit q->workAreaResized(QGuiApplication::screens().indexOf(screen));
 QT_WARNING_POP
+#endif
 }
 
 QDesktopWidget::QDesktopWidget()
@@ -212,10 +218,12 @@ QDesktopWidget::~QDesktopWidget()
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 bool QDesktopWidget::isVirtualDesktop() const
 {
     return QDesktopWidgetPrivate::isVirtualDesktop();
 }
+#endif
 
 bool QDesktopWidgetPrivate::isVirtualDesktop()
 {
@@ -242,24 +250,27 @@ int QDesktopWidgetPrivate::height()
     return geometry().height();
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 int QDesktopWidget::primaryScreen() const
 {
     return QDesktopWidgetPrivate::primaryScreen();
 }
+#endif
 
 int QDesktopWidgetPrivate::primaryScreen()
 {
     return 0;
 }
 
-int QDesktopWidget::numScreens() const
+int QDesktopWidgetPrivate::numScreens()
 {
-    return QDesktopWidgetPrivate::numScreens();
+    return qMax(QGuiApplication::screens().size(), 1);
 }
 
-int QDesktopWidgetPrivate::numScreens()
+#if QT_DEPRECATED_SINCE(5, 11)
+int QDesktopWidget::numScreens() const
 {
-    return qMax(QGuiApplication::screens().size(), 1);
+    return QDesktopWidgetPrivate::numScreens();
 }
 
 QWidget *QDesktopWidget::screen(int screen)
@@ -274,6 +285,7 @@ const QRect QDesktopWidget::availableGeometry(int screenNo) const
 {
     return QDesktopWidgetPrivate::availableGeometry(screenNo);
 }
+#endif
 
 const QRect QDesktopWidgetPrivate::availableGeometry(int screenNo)
 {
@@ -281,10 +293,12 @@ const QRect QDesktopWidgetPrivate::availableGeometry(int screenNo)
     return screen ? screen->availableGeometry() : QRect();
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 const QRect QDesktopWidget::screenGeometry(int screenNo) const
 {
     return QDesktopWidgetPrivate::screenGeometry(screenNo);
 }
+#endif
 
 const QRect QDesktopWidgetPrivate::screenGeometry(int screenNo)
 {
@@ -307,20 +321,12 @@ int QDesktopWidgetPrivate::screenNumber(const QWidget *w)
     if (screens.isEmpty()) // This should never happen
         return primaryScreen();
 
-    const QWindow *winHandle = w->windowHandle();
-    if (!winHandle) {
-        if (const QWidget *nativeParent = w->nativeParentWidget())
-            winHandle = nativeParent->windowHandle();
-    }
-
     // If there is more than one virtual desktop
     if (screens.count() != screens.constFirst()->virtualSiblings().count()) {
         // Find the root widget, get a QScreen from it and use the
         // virtual siblings for checking the window position.
-        if (winHandle) {
-            if (const QScreen *winScreen = winHandle->screen())
-                screens = winScreen->virtualSiblings();
-        }
+        if (const QScreen *winScreen = qt_widget_private(const_cast<QWidget *>(w))->associatedScreen())
+            screens = winScreen->virtualSiblings();
     }
 
     // Get the screen number from window position using screen geometry
@@ -344,10 +350,12 @@ int QDesktopWidgetPrivate::screenNumber(const QWidget *w)
     return allScreens.indexOf(widgetScreen);
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 int QDesktopWidget::screenNumber(const QPoint &p) const
 {
     return QDesktopWidgetPrivate::screenNumber(p);
 }
+#endif
 
 int QDesktopWidgetPrivate::screenNumber(const QPoint &p)
 {