Remove all code paths related to unsupported Apple platforms.

Now that the minimum deployment target (and thus SDK) is 10.9 for OS X
and 7.0 for iOS, all code paths affecting platform versions lower than
the aforementioned are removed.

Change-Id: Id985c7259c4ac069319d88f2c29c9559ae9e8641
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

7 files changed, 17 insertions, 51 deletions

diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 3924716b55..c450bad2de 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -987,15 +987,7 @@ void tst_QDir::canonicalPath_data()
     QTest::newRow("nonexistant") << "testd" << QString();
 
     QTest::newRow("rootPath") << QDir::rootPath() << QDir::rootPath();
-
-#ifdef Q_OS_MAC
-    // On Mac OS X 10.5 and earlier, canonicalPath depends on cleanPath which
-    // is itself very broken and fundamentally wrong on "/./" which, this would
-    // exercise
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6)
-#endif
-        QTest::newRow("rootPath + ./") << QDir::rootPath().append("./") << QDir::rootPath();
-
+    QTest::newRow("rootPath + ./") << QDir::rootPath().append("./") << QDir::rootPath();
     QTest::newRow("rootPath + ../.. ") << QDir::rootPath().append("../..") << QDir::rootPath();
 #if defined(Q_OS_WIN)
     QTest::newRow("drive:\\") << QDir::toNativeSeparators(QDir::rootPath()) << QDir::rootPath();
@@ -1994,13 +1986,7 @@ void tst_QDir::isRoot_data()
     QTest::newRow(QString("./ appended " + test).toLatin1()) << test << false;
 
     test = QDir(QDir::rootPath().append("./")).canonicalPath();
-#ifdef Q_OS_MAC
-    // On Mac OS X 10.5 and earlier, canonicalPath depends on cleanPath which
-    // is itself very broken and fundamentally wrong on "/./", which this would
-    // exercise
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6)
-#endif
-        QTest::newRow(QString("canonicalPath " + test).toLatin1()) << test << true;
+    QTest::newRow(QString("canonicalPath " + test).toLatin1()) << test << true;
 
 #if defined(Q_OS_WIN)
     test = QDir::rootPath().left(2);
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 60252a91de..2f039cbcd8 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -2856,27 +2856,19 @@ void tst_QSettings::isWritable()
 
         if (s1.contains("foo")) {
 #if defined(Q_OS_MACX)
-            if (QSysInfo::macVersion() >= QSysInfo::MV_10_9) {
-                QVERIFY(s1.isWritable());
-                if (format == QSettings::NativeFormat) {
-                    QVERIFY(!s2.isWritable());
-                    QVERIFY(!s3.isWritable());
-                } else {
-                    QVERIFY(s2.isWritable());
-                    QVERIFY(s3.isWritable());
-                }
-            } else if (QSysInfo::macVersion() >= QSysInfo::MV_10_7 &&
-                       format == QSettings::NativeFormat) {
-                QVERIFY(!s1.isWritable());
+            QVERIFY(s1.isWritable());
+            if (format == QSettings::NativeFormat) {
                 QVERIFY(!s2.isWritable());
                 QVERIFY(!s3.isWritable());
-            } else
-#endif
-            {
-                QVERIFY(s1.isWritable());
+            } else {
                 QVERIFY(s2.isWritable());
                 QVERIFY(s3.isWritable());
             }
+#else
+            QVERIFY(s1.isWritable());
+            QVERIFY(s2.isWritable());
+            QVERIFY(s3.isWritable());
+#endif
         } else {
             QVERIFY(!s1.isWritable());
             QVERIFY(!s2.isWritable());
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index dec8448ce3..42fed1191b 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -223,10 +223,6 @@ void tst_QLibrary::unload_data()
     QString appDir = QCoreApplication::applicationDirPath();
 
     QTest::newRow( "mylib" ) << appDir + "/mylib" << true;
-#ifdef Q_OS_MAC
-    if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_3)
-        QEXPECT_FAIL("mylib", "dlcompat cannot unload libraries", Continue);
-#endif
     QTest::newRow( "ok01" ) << appDir + "/nolib" << false;
 }
 
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index c679d1f108..9ce6fe6256 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -7895,10 +7895,6 @@ void tst_QNetworkReply::backgroundRequestInterruption()
         QNetworkSessionPrivate::setUsagePolicies(*const_cast<QNetworkSession *>(session.data()), original);
 
     QVERIFY(reply->isFinished());
-#ifdef Q_OS_OSX
-    if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
-        QEXPECT_FAIL("ftp, bg, nobg", "See QTBUG-32435", Abort);
-#endif
     QCOMPARE(reply->error(), error);
 #endif
 }
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 56c2b6583e..c1fe012683 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -5086,10 +5086,6 @@ public:
 
 void tst_QGraphicsItem::paint()
 {
-#ifdef Q_OS_MACX
-    if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_7)
-        QSKIP("QTBUG-31454 - Unstable auto-test");
-#endif
     QGraphicsScene scene;
 
     PaintTester paintTester;
@@ -6574,12 +6570,6 @@ public:
 
 void tst_QGraphicsItem::ensureUpdateOnTextItem()
 {
-#ifdef Q_OS_MAC
-    if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_7) {
-        QSKIP("This test is unstable on 10.7 in CI");
-    }
-#endif
-
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index e9f5175466..eaa2d1637a 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -1209,7 +1209,7 @@ void tst_QMenuBar::task256322_highlight()
     QTRY_VERIFY(!menu2.isVisible());
     QVERIFY(!menu.isVisible());
 #ifdef Q_OS_MAC
-    if ((QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) && (win.menuBar()->activeAction() != nothing))
+    if (win.menuBar()->activeAction() != nothing)
         QEXPECT_FAIL("", "QTBUG-30565: Unstable test", Continue);
 #endif
     QTRY_COMPARE(win.menuBar()->activeAction(), nothing);
diff --git a/tests/manual/qsysinfo/main.cpp b/tests/manual/qsysinfo/main.cpp
index 57ce63adb3..5add1e4f74 100644
--- a/tests/manual/qsysinfo/main.cpp
+++ b/tests/manual/qsysinfo/main.cpp
@@ -80,6 +80,7 @@ QByteArray macVersionToString(QSysInfo::MacVersion v)
     CASE_VERSION(MV_10_8);
     CASE_VERSION(MV_10_9);
     CASE_VERSION(MV_10_10);
+    CASE_VERSION(MV_10_11);
 
     CASE_VERSION(MV_IOS_4_3);
     CASE_VERSION(MV_IOS_5_0);
@@ -89,6 +90,11 @@ QByteArray macVersionToString(QSysInfo::MacVersion v)
     CASE_VERSION(MV_IOS_7_0);
     CASE_VERSION(MV_IOS_7_1);
     CASE_VERSION(MV_IOS_8_0);
+    CASE_VERSION(MV_IOS_8_1);
+    CASE_VERSION(MV_IOS_8_2);
+    CASE_VERSION(MV_IOS_8_3);
+    CASE_VERSION(MV_IOS_8_4);
+    CASE_VERSION(MV_IOS_9_0);
     case QSysInfo::MV_IOS:      // shouldn't happen:
         break;
     }