diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-19 03:37:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 12:49:48 +0200 |
| commit | 39e6d75511f5871a43449a5c435535d3c0b853de (patch) | |
| tree | 63dbdc91fef209c019586dcc1b3ee868be92b6c7 /tests/auto/widgets/styles | |
| parent | e998f971f6b7d05748b9478909c068605507d8f6 (diff) | |
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>
Diffstat (limited to 'tests/auto/widgets/styles')
| -rw-r--r-- | tests/auto/widgets/styles/qmacstyle/qmacstyle.pro | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro index 7e02f6309f..4cd85ab7f2 100644 --- a/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro +++ b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro @@ -2,6 +2,3 @@ CONFIG += testcase TARGET = tst_qmacstyle QT += widgets testlib SOURCES += tst_qmacstyle.cpp - - -mac*:CONFIG+=insignificant_test # QTBUG-25296 diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp index f732dfa18d..62e1c7c8ef 100644 --- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp @@ -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]); } } |