Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

1 files changed, 3 insertions, 1 deletions

diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 0777bed65c..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());
 
@@ -697,7 +699,7 @@ private:
     QLayout *takeLayout();
 
     friend class QBackingStoreDevice;
-    friend class QWidgetBackingStore;
+    friend class QWidgetRepaintManager;
     friend class QApplication;
     friend class QApplicationPrivate;
     friend class QGuiApplication;