whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable the QMacStyle test. 

This test has only stable failures.  Mark those failures with
QEXPECT_FAIL and re-enable the test.

Task-number: QTBUG-25296
Change-Id: I5615700ec8119a827c30e43ae651a684e78170fe
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
bb10
Jason McDonald 2012-04-19 03:37:37 +10:00 committed by Qt by Nokia
parent e998f971f6
commit 39e6d75511
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/widgets/styles/qmacstyle/qmacstyle.pro
View File

@ -2,6 +2,3 @@ CONFIG += testcase
TARGET = tst_qmacstyle
QT += widgets testlib
SOURCES += tst_qmacstyle.cpp
mac*:CONFIG+=insignificant_test # QTBUG-25296

3
tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
View File

@ -135,6 +135,7 @@ void tst_QMacStyle::sizeHints()
QCOMPARE(sh(&progress1).width(), SIZE(16, 10, 10)); // Builder
QRadioButton radio1("Radio", &w);
QEXPECT_FAIL("", "QTBUG-25296", Abort);
QCOMPARE(sh(&radio1).height(), SIZE(15, 12, 10)); // Builder
QCheckBox checkBox1("Switch", &w);
@ -401,6 +402,8 @@ void tst_QMacStyle::smallMiniNormalExclusivity()
opt.initFrom(&dummyWidget);
QSize size = dummyWidget.style()->sizeFromContents(QStyle::CT_PushButton, &opt,
QSize(0, 0), &dummyWidget);
if (size.height() != expected[i])
QEXPECT_FAIL("", "QTBUG-25296", Abort);
QCOMPARE(size.height(), expected[i]);
}
}