diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index ec4d0c00..587d453e 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -6279,15 +6279,21 @@ void TestDocks::tst_constraintsPropagateUp() auto frame1 = dock1->frame(); QVERIFY(qAbs(widgetMinLength(frame1, Qt::Horizontal) - minWidth) < 10); //10px for styling differences + +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + // Flaky with 5.9 QVERIFY(qAbs(widgetMinLength(frame1, Qt::Vertical) - (minHeight + frame1->nonContentsHeight())) < 10); //10px for styling differences +#endif // Add dock2 side-by side, so the Frame now has a title bar. auto oldFw2 = dock2->window(); dock1->addDockWidgetToContainingWindow(dock2, Location_OnLeft); TitleBar *tb = dock1->titleBar(); QVERIFY(tb->isVisible()); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + // Flaky with 5.9 QVERIFY(qAbs(widgetMinLength(frame1, Qt::Vertical) - (minHeight + frame1->nonContentsHeight())) < 10); - +#endif delete dock1->window(); delete oldFw2; }