From 03e1c35ab6a4395db3c7b71dd0bdd9a1956f7272 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 10 May 2018 10:25:10 +0200 Subject: Fix tst_WaylandCompositor::sizeFollowsWindow on high-dpi The QWindow we use may have devicePixelRatio != 1 and that caused the test to fail. Change-Id: I3d248ed85cea521a3d543026a87f92c085116461 Reviewed-by: Paul Olav Tvete --- tests/auto/compositor/compositor/tst_compositor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/auto/compositor') diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 575ea6466..ae5ea927d 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -261,7 +261,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; -- cgit v1.2.3