diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-18 08:49:49 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-23 09:34:16 +0100 |
| commit | 9d87e1db1f6051a118b75a73aa0fb8a8c2606b7c (patch) | |
| tree | 4da42ceca227e2f6a5e0df1caa94003c80af30bc | |
| parent | e3c59443c6f45a1e358870f22b8fd7e76bf7abb0 (diff) | |
Expect tst_QWizard::setPixmap() failure on Mac OS X
Task-number: QTBUG-23701
Change-Id: Iba5b926e57c1565856d17bbfbff4d1da75645ad4
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| -rw-r--r-- | tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 56b5abaa71..5ea57b7465 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -442,10 +442,13 @@ void tst_QWizard::setPixmap() QVERIFY(wizard.pixmap(QWizard::LogoPixmap).isNull()); QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).isNull()); #ifdef Q_OS_MAC - if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_3) + if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_3) { + QEXPECT_FAIL("", "QTBUG-23701", Continue); QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false); - else // fall through since the image doesn't exist on a 10.3 system. + } else { + // fall through since the image doesn't exist on a 10.3 system. QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); + } #else QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull()); #endif @@ -454,10 +457,13 @@ void tst_QWizard::setPixmap() QVERIFY(page->pixmap(QWizard::LogoPixmap).isNull()); QVERIFY(page->pixmap(QWizard::WatermarkPixmap).isNull()); #ifdef Q_OS_MAC - if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_3) + if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_3) { + QEXPECT_FAIL("", "QTBUG-23701", Continue); QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false); - else // fall through since the image doesn't exist on a 10.3 system. + } else { + // fall through since the image doesn't exist on a 10.3 system. QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); + } #else QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); #endif |