From 9659ddb38a86dd00dc565e4384aab55f59b1a23d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 15 Sep 2020 21:55:23 +0200 Subject: [PATCH] Update dependencies on dev in qt/qtwayland Add one moc include to make things compile after the changes in qtbase. The nooutput test fails with this update because high-dpi is now enabled by default. When running with a placeholder screen, we get a scale factor of NaN because the default logicalDpi() implementation divides by physical size, which is 0x0 in the case of the placeholder. We temporarily disable the test in order to get the update in. Task-number: QTBUG-86698 Change-Id: I474f6970186e93905332c679f2cec5fea459de64 Reviewed-by: Lars Knoll --- tests/auto/wayland/nooutput/tst_nooutput.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/wayland/nooutput/tst_nooutput.cpp b/tests/auto/wayland/nooutput/tst_nooutput.cpp index 098d88d9908..7f491c84009 100644 --- a/tests/auto/wayland/nooutput/tst_nooutput.cpp +++ b/tests/auto/wayland/nooutput/tst_nooutput.cpp @@ -56,6 +56,7 @@ private slots: void tst_nooutput::noScreens() { + QSKIP("QTBUG-86698 - Temporarily skipped for dependency update"); QRasterWindow window; window.resize(16, 16); window.show();