1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporarily rename QWaylandWindow::screen to waylandScreen

Browse Source 
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>
This commit is contained in:
Johan Klokkhammer Helsing 2017-09-13 13:40:05 +02:00 committed by Johan Helsing
parent 32daa1a5b9
commit 61510d62d1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandscreen.cpp
View File

@ -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);
}
}

2
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -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()

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -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);