Remove the usage of deprecated APIs from QSysInfo
Replaced: QSysInfo::macVersion() -> QOperatingSystemVersion::current() Q_MV_OSX(10, 13) -> QOperatingSystemVersion::MacOSHighSierra Task-number: QTBUG-76491 Change-Id: Iae4f9c319ff16314fb04bbefaa48935a0f618007 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
parent
5248e895ad
commit
aa6e0e3e30
@ -417,7 +417,7 @@ void tst_QWizard::setPixmap()
|
||||
QVERIFY(wizard.pixmap(QWizard::BannerPixmap).isNull());
|
||||
QVERIFY(wizard.pixmap(QWizard::LogoPixmap).isNull());
|
||||
QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).isNull());
|
||||
if (QSysInfo::macVersion() <= Q_MV_OSX(10, 13))
|
||||
if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::MacOSHighSierra)
|
||||
QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
|
||||
else
|
||||
QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull());
|
||||
@ -425,7 +425,7 @@ void tst_QWizard::setPixmap()
|
||||
QVERIFY(page->pixmap(QWizard::BannerPixmap).isNull());
|
||||
QVERIFY(page->pixmap(QWizard::LogoPixmap).isNull());
|
||||
QVERIFY(page->pixmap(QWizard::WatermarkPixmap).isNull());
|
||||
if (QSysInfo::macVersion() <= Q_MV_OSX(10, 13))
|
||||
if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::MacOSHighSierra)
|
||||
QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
|
||||
else
|
||||
QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull());
|
||||
|
Loading…
Reference in New Issue
Block a user