diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:01:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:01:52 +0200 |
| commit | c2c0da3ffa9d8e603acc1135c6f02e10b6bfcc52 (patch) | |
| tree | d92a8a28cc480b81aaf9dc2b510030e351ac31c2 /tests/auto/compositor/compositor | |
| parent | 42f71e680c6146526fb18116b1b98995543443c0 (diff) | |
| parent | 03e1c35ab6a4395db3c7b71dd0bdd9a1956f7272 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I50c42c52a7b646317c7a87f364507fe232a55bf0
Diffstat (limited to 'tests/auto/compositor/compositor')
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index d1f501e24..e3c4daccc 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -383,7 +383,9 @@ void tst_WaylandCompositor::sizeFollowsWindow() compositor.create(); - QWaylandOutputMode mode(window.size(), qFloor(window.screen()->refreshRate() * 1000)); + // window.size() is not in pixels + auto pixelSize = window.size() * window.devicePixelRatio(); + QWaylandOutputMode mode(pixelSize, qFloor(window.screen()->refreshRate() * 1000)); MockClient client; |