Temporarily rename QWaylandWindow::screen to waylandScreen

The function is being made virtual in qtbase. Rename it to avoid issues with CI
(missing override). It can be renamed back and made to override later.

Task-number: QTBUG-63177
Change-Id: I4e3029445b34c53bfdd3e99254a690a1fac6f06e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>

3 files changed, 3 insertions, 3 deletions

diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index 7f12a4214..2f90be813 100644
--- a/src/client/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
@@ -147,7 +147,7 @@ void QWaylandScreen::setOrientationUpdateMask(Qt::ScreenOrientations mask)
 {
     foreach (QWindow *window, QGuiApplication::allWindows()) {
         QWaylandWindow *w = static_cast<QWaylandWindow *>(window->handle());
-        if (w && w->screen() == this)
+        if (w && w->waylandScreen() == this)
             w->setOrientationMask(mask);
     }
 }
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 9cc673c0c..97596896f 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -193,7 +193,7 @@ void QWaylandWindow::initWindow()
         }
     }
 
-    mScale = screen()->scale();
+    mScale = waylandScreen()->scale();
 
     // Enable high-dpi rendering. Scale() returns the screen scale factor and will
     // typically be integer 1 (normal-dpi) or 2 (high-dpi). Call set_buffer_scale()
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 9f6ff5b4e..6e07ff1c7 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -143,7 +143,7 @@ public:
     QWaylandDisplay *display() const { return mDisplay; }
     QWaylandShellSurface *shellSurface() const;
     QWaylandSubSurface *subSurfaceWindow() const;
-    QWaylandScreen *screen() const { return mScreen; }
+    QWaylandScreen *waylandScreen() const { return mScreen; }
 
     void handleContentOrientationChange(Qt::ScreenOrientation orientation) override;
     void setOrientationMask(Qt::ScreenOrientations mask);