From bdc558019ac6660a32d20a428a8694ef6bd4d4d3 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 18 Oct 2013 18:40:39 +0200 Subject: tests: Replace Q_OS_MACX -> Q_OS_OSX Use the correct identifier for the OS X operating system. Change-Id: I7158a6b77e5e7418bc6b0a565f003500820a346d Reviewed-by: Jake Petroules Reviewed-by: Eike Ziller --- tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 10 +++++----- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 2 +- tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp | 4 ++-- tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 2 +- .../kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp | 2 +- tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index f0fa860686..dc83cf2fc4 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -514,20 +514,20 @@ void tst_QSettings::ctor() QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp"); if (format == QSettings::NativeFormat) { #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) -# ifdef Q_OS_MACX +# ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("native", "See QTBUG-32655", Continue); -# endif // Q_OS_MACX +# endif // Q_OS_OSX QCOMPARE(settings5.value("key 1").toString(), QString("gurgle")); #else QVERIFY(!settings5.contains("key 1")); #endif } else { #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) -# ifdef Q_OS_MACX +# ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("", "See QTBUG-32655", Continue); -# endif // Q_OS_MACX +# endif // Q_OS_OSX QCOMPARE(settings5.value("key 1").toString(), QString("gurgle")); #else QVERIFY(!settings5.contains("key 1")); @@ -3183,7 +3183,7 @@ void tst_QSettings::rainersSyncBugOnMac() { QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP"); -#ifdef Q_OS_MACX +#ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("native", "See QTBUG-32655", Continue); #endif diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 7ad7880330..c4983f4462 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -223,7 +223,7 @@ void tst_QWindow::positioning() window.setWindowState(Qt::WindowFullScreen); QCoreApplication::processEvents(); -#ifdef Q_OS_MACX +#ifdef Q_OS_OSX QEXPECT_FAIL("", "Multiple failures in this test on Mac OS X, see QTBUG-23059", Abort); #endif QTRY_COMPARE(window.received(QEvent::Resize), 2); diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 3f6eaae89b..3d2cde5fd3 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -502,10 +502,10 @@ void tst_QGlyphRun::drawMultiScriptText2() drawGlyphs.save("drawMultiScriptText2_drawGlyphIndexes.png"); #endif -#ifdef Q_OS_MACX +#ifdef Q_OS_OSX if (drawGlyphs.toImage() != textLayoutDraw.toImage()) QEXPECT_FAIL("", "See QTBUG-32690", Continue); -#endif // Q_OS_MACX +#endif // Q_OS_OSX QCOMPARE(drawGlyphs, textLayoutDraw); } diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 0e8d9fa2a3..2826c497df 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -7588,7 +7588,7 @@ void tst_QNetworkReply::backgroundRequestInterruption() QNetworkSessionPrivate::setUsagePolicies(*const_cast(session.data()), original); QVERIFY(reply->isFinished()); -#ifdef Q_OS_MACX +#ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("ftp, bg, nobg", "See QTBUG-32435", Abort); #endif diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index 9e03884e4e..1271bf38ca 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -380,7 +380,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy() QFETCH(int, port); // The generic system proxy is only available on the following platforms -#if (!defined Q_OS_BLACKBERRY) && (!defined Q_OS_WIN) && (!defined Q_OS_MACX) +#if (!defined Q_OS_BLACKBERRY) && (!defined Q_OS_WIN) && (!defined Q_OS_OSX) qputenv(envVar, url); const QList systemProxy = QNetworkProxyFactory::systemProxyForQuery(); QCOMPARE(systemProxy.size(), 1); diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index c240b5eb35..4506d0af14 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -439,7 +439,7 @@ 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_MACX +#ifdef Q_OS_OSX QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false); #else QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull()); @@ -448,7 +448,7 @@ 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_MACX +#ifdef Q_OS_OSX QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false); #else QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull()); -- cgit v1.2.3