diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-09-13 13:40:05 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2017-09-13 11:48:16 +0000 |
| commit | 62c058f83add9f559f09cf74bc50f721ed75d76a (patch) | |
| tree | 6b051c0478a92d7717de921204256e98bb2ab25f /src/client/qwaylandwindow.cpp | |
| parent | 041cce96aa0996272983f5ef35c7416ba0fc6866 (diff) | |
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>
Diffstat (limited to 'src/client/qwaylandwindow.cpp')
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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() |