From f03c68fec113590af8dcf3b74765dbcb85b3536e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 11 Feb 2024 17:32:39 +0100 Subject: [PATCH] tst_QWidgetRepaintManager::scrollWithOverlap(): Disable scroll bars The scroll bars may show up in one of the grabs and not the other, (as seen on macOS), which is interesting, and possibly a bug, but is not what the test is checking for, so let's disable the scrollbars to stabilize the test. Change-Id: Iad97ca5b22783bb1bee51b560957c5461b7d9923 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit c6fc6cef33b2b343fd507ee1f6f6ec5d32b6df4e) Reviewed-by: Qt Cherry-pick Bot --- .../kernel/qwidgetrepaintmanager/tst_qwidgetrepaintmanager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/widgets/kernel/qwidgetrepaintmanager/tst_qwidgetrepaintmanager.cpp b/tests/auto/widgets/kernel/qwidgetrepaintmanager/tst_qwidgetrepaintmanager.cpp index 48567d7a111..57bbd09d5bc 100644 --- a/tests/auto/widgets/kernel/qwidgetrepaintmanager/tst_qwidgetrepaintmanager.cpp +++ b/tests/auto/widgets/kernel/qwidgetrepaintmanager/tst_qwidgetrepaintmanager.cpp @@ -499,6 +499,8 @@ void tst_QWidgetRepaintManager::scrollWithOverlap() : QWidget(parent, Qt::WindowStaysOnTopHint) { m_scrollArea = new QScrollArea(this); + m_scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); QWidget *w = new QWidget; w->setPalette(QPalette(Qt::gray)); w->setAutoFillBackground(true);