From 5b70efb1258fd7435e8cfbed1a54abb46db0adcc Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 26 Sep 2013 13:37:08 +0200 Subject: Mac: QWizard default background pixmap works again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-26722 Change-Id: I579111b5d34f8e3cdc6bb016d9c0e42ec3ffb8c9 Reviewed-by: Morten Johan Sørvig Reviewed-by: Gabriel de Dietrich Reviewed-by: Stephen Chu --- tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index c3fc050275..c240b5eb35 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -439,14 +439,8 @@ void tst_QWizard::setPixmap() QVERIFY(wizard.pixmap(QWizard::BannerPixmap).isNull()); QVERIFY(wizard.pixmap(QWizard::LogoPixmap).isNull()); QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).isNull()); -#ifdef Q_OS_MAC - 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. - QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); - } +#ifdef Q_OS_MACX + QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false); #else QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull()); #endif @@ -454,14 +448,8 @@ void tst_QWizard::setPixmap() QVERIFY(page->pixmap(QWizard::BannerPixmap).isNull()); QVERIFY(page->pixmap(QWizard::LogoPixmap).isNull()); QVERIFY(page->pixmap(QWizard::WatermarkPixmap).isNull()); -#ifdef Q_OS_MAC - 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. - QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); - } +#ifdef Q_OS_MACX + QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false); #else QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); #endif -- cgit v1.2.3