From e39f30a0d27608cf112f818f2c63418bfeb93cb3 Mon Sep 17 00:00:00 2001 From: Fabian Bumberger Date: Wed, 2 Apr 2014 17:28:52 +0200 Subject: Fix QTabBar autotest for high DPI displays Change-Id: Ic50d7fb9eb3568f16dd1422c380a4ae7bb288a51 Reviewed-by: Sergio Ahumada --- tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 0dac7d85e4..345b8d82ad 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -316,12 +316,17 @@ void tst_QTabBar::sizeHints() tabBar.setUsesScrollButtons(false); tabBar.setElideMode(Qt::ElideRight); // qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint(); - QVERIFY(tabBar.minimumSizeHint().width() < 500); - QVERIFY(tabBar.sizeHint().width() > 700); // unchanged + + // The sizeHint is very much dependent on the screen DPI value + // so we can not really predict it. + int tabBarMinSizeHintWidth = tabBar.minimumSizeHint().width(); + int tabBarSizeHintWidth = tabBar.sizeHint().width(); + QVERIFY(tabBarMinSizeHintWidth < tabBarSizeHintWidth); + QVERIFY(tabBarSizeHintWidth > 700); // unchanged tabBar.addTab("This is tab10 with a very long title"); - QVERIFY(tabBar.minimumSizeHint().width() < 600); - QVERIFY(tabBar.sizeHint().width() > 700); // unchanged + QVERIFY(tabBar.minimumSizeHint().width() > tabBarMinSizeHintWidth); + QVERIFY(tabBar.sizeHint().width() > tabBarSizeHintWidth); } void tst_QTabBar::setUsesScrollButtons_data() -- cgit v1.2.3