diff options
Diffstat (limited to 'tests/baseline/widgets/tst_baseline_widgets.cpp')
| -rw-r--r-- | tests/baseline/widgets/tst_baseline_widgets.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/tests/baseline/widgets/tst_baseline_widgets.cpp b/tests/baseline/widgets/tst_baseline_widgets.cpp index ff72ae62ab..ffabf9e07e 100644 --- a/tests/baseline/widgets/tst_baseline_widgets.cpp +++ b/tests/baseline/widgets/tst_baseline_widgets.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qbaselinetest.h> #include <qwidgetbaselinetest.h> @@ -1156,8 +1156,11 @@ void tst_Widgets::tst_QMenu() testWindow()->show(); QVERIFY(QTest::qWaitForWindowExposed(testWindow())); - QRect testWindowRect(testWindow()->geometry()); + // There can be rounded corners in the window and this leads to test + // case to be fuzzy. Adjust window rectangle that need to be captured + int adjustPixel = menu1.geometry().left(); + testWindowRect.adjust(adjustPixel, adjustPixel, -adjustPixel, -adjustPixel); QBASELINE_CHECK_DEFERRED(takeScreenSnapshot(testWindowRect), "showitems"); // Normal menu item with text @@ -1217,7 +1220,7 @@ void tst_Widgets::tst_QCombobox() takeStandardSnapshots(); QTest::keyClick(combobox.get(), Qt::Key_Down, Qt::AltModifier); - QBASELINE_CHECK_DEFERRED(takeScreenSnapshot(testWindow()->rect()), "combobox"); + QBASELINE_CHECK_DEFERRED(takeScreenSnapshot(testWindow()->geometry()), "combobox"); } void tst_Widgets::tst_QCommandLinkButton_data() @@ -1272,17 +1275,6 @@ void tst_Widgets::tst_QLCDNumber() QBASELINE_CHECK_DEFERRED(takeSnapshot(), "lcdnumber"); } -#define main _realmain -QTEST_MAIN(tst_Widgets) -#undef main - -int main(int argc, char *argv[]) -{ - // Avoid rendering variations caused by QHash randomization - QHashSeed::setDeterministicGlobalSeed(); - - QBaselineTest::handleCmdLineArgs(&argc, &argv); - return _realmain(argc, argv); -} +QBASELINETEST_MAIN(tst_Widgets) #include "tst_baseline_widgets.moc" |