Corelib: s/Q_OS_MAC/Q_OS_DARWIN/wg except for doc and definition

I got tired of being told off by the inanity 'bot for faithfully
reflecting existing #if-ery in new #if-ery. Retain only the
documentation and definition of the deprecated define.

Change-Id: I47f47b76bd239a360f27ae5afe593dfad8746538
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

17 files changed, 40 insertions, 40 deletions

diff --git a/tests/auto/corelib/io/largefile/tst_largefile.cpp b/tests/auto/corelib/io/largefile/tst_largefile.cpp
index a9108c577f..b09d6b6f50 100644
--- a/tests/auto/corelib/io/largefile/tst_largefile.cpp
+++ b/tests/auto/corelib/io/largefile/tst_largefile.cpp
@@ -37,9 +37,7 @@ public:
         , fd_(-1)
         , stream_(0)
     {
-    #if defined(QT_LARGEFILE_SUPPORT) && !defined(Q_OS_MAC) && !defined(Q_OS_QNX)
-        maxSizeBits = 36; // 64 GiB
-    #elif defined(Q_OS_MAC)
+    #if defined(Q_OS_DARWIN)
         // HFS+ does not support sparse files, so we limit file size for the test
         // on Mac OS.
         maxSizeBits = 24; // 16 MiB
@@ -48,6 +46,8 @@ public:
         // This means that files are limited to 2 GB − 1 bytes.
         // Limit max size to 256MB
         maxSizeBits = 28; // 256 MiB
+    #elif defined(QT_LARGEFILE_SUPPORT)
+        maxSizeBits = 36; // 64 GiB
     #else
         maxSizeBits = 24; // 16 MiB
     #endif
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index bce19430ce..d7b0d2b1c1 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -1621,7 +1621,7 @@ void tst_QDir::rename()
     QDir dir;
     QVERIFY(dir.rename("rename-test", "rename-test-renamed"));
     QVERIFY(dir.rename("rename-test-renamed", "rename-test"));
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
     QVERIFY(!dir.rename("rename-test", "/etc/rename-test-renamed"));
 #elif !defined(Q_OS_WIN)
     // on windows this is possible - maybe make the test a bit better
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index a7b3464fd6..65011ec5bb 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -48,7 +48,7 @@ QT_END_NAMESPACE
 # include <unistd.h>
 # include <private/qcore_unix_p.h>
 #endif
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 # include <sys/mount.h>
 #elif defined(Q_OS_LINUX)
 # include <sys/vfs.h>
@@ -3605,7 +3605,7 @@ void tst_QFile::caseSensitivity()
 {
 #if defined(Q_OS_WIN)
     const bool caseSensitive = false;
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_DARWIN)
      const bool caseSensitive = pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE);
 #else
     const bool caseSensitive = true;
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index abd4dfed5e..c9db19db22 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -201,7 +201,7 @@ private slots:
 
     void isHidden_data();
     void isHidden();
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
     void isHiddenFromFinder();
 #endif
 
@@ -762,7 +762,7 @@ void tst_QFileInfo::bundleName_data()
 
     QTest::newRow("root") << "/" << "";
     QTest::newRow("etc") << "/etc" << "";
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     QTest::newRow("safari") << "/Applications/Safari.app" << "Safari";
 #endif
 }
@@ -1019,7 +1019,7 @@ void tst_QFileInfo::compare_data()
         << m_sourceFile
 #if defined(Q_OS_WIN)
         << true;
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_DARWIN)
         << !pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE);
 #else
         << false;
@@ -1028,7 +1028,7 @@ void tst_QFileInfo::compare_data()
 
 void tst_QFileInfo::compare()
 {
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
     if (qstrcmp(QTest::currentDataTag(), "casesense1") == 0)
         QSKIP("Qt thinks all UNIX filesystems are case sensitive, see QTBUG-28246");
 #endif
@@ -1535,14 +1535,14 @@ void tst_QFileInfo::isHidden_data()
     QTest::newRow("/path/to/.hidden-directory/..") << QDir::currentPath() + QString("/.hidden-directory/..") << true;
 #endif
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
     // /bin has the hidden attribute on OS X
     QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << true;
 #elif !defined(Q_OS_WIN)
     QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << false;
 #endif
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     QTest::newRow("mac_etc") << QString::fromLatin1("/etc") << true;
     QTest::newRow("mac_private_etc") << QString::fromLatin1("/private/etc") << false;
     QTest::newRow("mac_Applications") << QString::fromLatin1("/Applications") << false;
@@ -1558,7 +1558,7 @@ void tst_QFileInfo::isHidden()
     QCOMPARE(fi.isHidden(), isHidden);
 }
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
 void tst_QFileInfo::isHiddenFromFinder()
 {
     const char *filename = "test_foobar.txt";
@@ -1584,7 +1584,7 @@ void tst_QFileInfo::isBundle_data()
     QTest::addColumn<QString>("path");
     QTest::addColumn<bool>("isBundle");
     QTest::newRow("root") << QString::fromLatin1("/") << false;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     QTest::newRow("mac_Applications") << QString::fromLatin1("/Applications") << false;
     QTest::newRow("mac_Applications") << QString::fromLatin1("/Applications/Safari.app") << true;
 #endif
@@ -2007,7 +2007,7 @@ private:
 
 void tst_QFileInfo::testDecomposedUnicodeNames()
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
     QSKIP("This is a OS X only test (unless you know more about filesystems, then maybe you should try it ;)");
 #else
     QFETCH(QString, filePath);
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index dfdf4e05c1..8438e904d1 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -563,7 +563,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
     QVERIFY2(testFile.write(QByteArrayLiteral("hello again")), msgFileOperationFailed("write", testFile));
     testFile.close();
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     // wait again for the file's atime to be updated
     QTest::qWait(2000);
 #endif
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 992d3ff0c7..2d9242a118 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -1501,7 +1501,7 @@ void tst_QProcess::failToStart()
 // to many processes here will cause test failures later on.
 #if defined Q_OS_HPUX
    const int attempts = 15;
-#elif defined Q_OS_MAC
+#elif defined Q_OS_DARWIN
    const int attempts = 15;
 #else
    const int attempts = 50;
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index bf1c165b4f..2994b32dc1 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -131,7 +131,7 @@ private slots:
     void testRegistryShortRootNames();
     void testRegistry32And64Bit();
     void trailingWhitespace();
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     void fileName();
 #endif
     void isWritable_data() { populateWithFormats(); }
@@ -497,7 +497,7 @@ void tst_QSettings::ctor()
         QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp");
 
         bool caseSensitive = true;
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
         if (format == QSettings::NativeFormat) {
             // more details in QMacSettingsPrivate::QMacSettingsPrivate(), organization was comify()-ed
             caseSensitive = settings5.fileName().contains("SoftWare.ORG");;
@@ -578,7 +578,7 @@ void tst_QSettings::ctor()
             QCoreApplication::instance()->setOrganizationName("");
             QCoreApplication::instance()->setApplicationName("");
             QSettings settings;
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
             QEXPECT_FAIL("native", "Default settings on Mac are valid, despite organization domain, name, and app name being null", Continue);
 #endif
             QCOMPARE(settings.status(), QSettings::AccessError);
@@ -593,7 +593,7 @@ void tst_QSettings::ctor()
         }
 
         QSettings settings(format, QSettings::UserScope, "", "");
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
         QEXPECT_FAIL("native", "Default settings on Mac are valid, despite organization domain, name, and app name being null", Continue);
 #endif
         QCOMPARE(settings.status(), QSettings::AccessError);
@@ -2902,7 +2902,7 @@ void tst_QSettings::testCaseSensitivity()
     }
 }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 // Please write a fileName() test for the other platforms
 void tst_QSettings::fileName()
 {
@@ -3310,7 +3310,7 @@ void tst_QSettings::setPath()
         path checks that it has no bad side effects.
     */
     for (int i = 0; i < 2; ++i) {
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN)
         TEST_PATH(i == 0, "conf", NativeFormat, UserScope, "alpha")
         TEST_PATH(i == 0, "conf", NativeFormat, SystemScope, "beta")
 #endif
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index 070c0c5318..2de0d54124 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -1387,7 +1387,7 @@ void tst_QUrl::fromLocalFileNormalize()
 
 void tst_QUrl::macTypes()
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
     QSKIP("This is a Mac-only test");
 #else
     extern void tst_QUrl_mactypes(); // in tst_qurl_mac.mm
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index 018756e81e..39e47b8772 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -273,7 +273,7 @@ void tst_QLibrary::load_data()
     QTest::newRow( "notexist" ) << appDir + "/nolib" << false;
     QTest::newRow( "badlibrary" ) << appDir + "/qlibrary.pro" << false;
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     QTest::newRow("ok (libmylib ver. 1)") << appDir + "/libmylib" <<true;
 #endif
 
@@ -462,7 +462,7 @@ void tst_QLibrary::isLibrary_data()
     QTest::newRow("version+.so+version") << QString("liboil-0.3.so.0.1.0") << so_VALID;
 
     // special tests:
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     QTest::newRow("good (libmylib.1.0.0.dylib)") << QString("libmylib.1.0.0.dylib") << true;
     QTest::newRow("good (libmylib.dylib)") << QString("libmylib.dylib") << true;
     QTest::newRow("good (libmylib.so)") << QString("libmylib.so") << true;
@@ -499,7 +499,7 @@ void tst_QLibrary::errorString_data()
 #ifdef Q_OS_WIN
     QTest::newRow("bad load() with .dll suffix") << (int)Load << QString("nosuchlib.dll") << false << QString("Cannot load library nosuchlib.dll: The specified module could not be found.");
 //    QTest::newRow("bad unload") << (int)Unload << QString("nosuchlib.dll") << false << QString("QLibrary::unload_sys: Cannot unload nosuchlib.dll (The specified module could not be found.)");
-#elif defined Q_OS_MAC
+#elif defined Q_OS_DARWIN
 #else
     QTest::newRow("load invalid file") << (int)Load << QFINDTESTDATA("library_path/invalid.so") << false << QString("Cannot load library.*");
 #endif
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index 5af39c4f3e..0e1abdf536 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
@@ -57,7 +57,7 @@ void tst_QPlugin::loadDebugPlugin()
         if (!QLibrary::isLibrary(fileName))
             continue;
         QPluginLoader loader(dir.filePath(fileName));
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
         // we can always load a plugin on unix
         QVERIFY(loader.load());
         QObject *object = loader.instance();
@@ -90,7 +90,7 @@ void tst_QPlugin::loadReleasePlugin()
         if (!QLibrary::isLibrary(fileName))
             continue;
         QPluginLoader loader(dir.filePath(fileName));
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
         // we can always load a plugin on unix
         QVERIFY(loader.load());
         QObject *object = loader.instance();
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index 6d68bdf3e0..adea6af515 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -277,7 +277,7 @@ void tst_QPluginLoader::errorString()
     QVERIFY(!unloaded);
     }
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HPUX)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HPUX)
     {
     QPluginLoader loader( sys_qualifiedLibraryName("almostplugin"));     //a plugin with unresolved symbols
     loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
index e57f8127b5..e2f8762080 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
@@ -424,7 +424,7 @@ void tst_QUuid::processUniqueness()
     QString processTwoOutput;
 
     // Start it once
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     process.start("testProcessUniqueness/testProcessUniqueness.app");
 #elif defined(Q_OS_ANDROID)
     process.start("libtestProcessUniqueness.so");
@@ -435,7 +435,7 @@ void tst_QUuid::processUniqueness()
     processOneOutput = process.readAllStandardOutput();
 
     // Start it twice
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     process.start("testProcessUniqueness/testProcessUniqueness.app");
 #elif defined(Q_OS_ANDROID)
     process.start("libtestProcessUniqueness.so");
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
index 6ff8cc088e..8ba44fbc43 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
@@ -2349,7 +2349,7 @@ void tst_QByteArray::isLower()
 
 void tst_QByteArray::macTypes()
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
     QSKIP("This is a Apple-only test");
 #else
     extern void tst_QByteArray_macTypes(); // in qbytearray_mac.mm
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index 194263aacf..762b1ed6c4 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <fenv.h>
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
 #    include <stdlib.h>
 #endif
 
@@ -43,7 +43,7 @@ private slots:
 #if defined(Q_OS_WIN)
     void windowsDefaultLocale();
 #endif
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
     void macDefaultLocale();
 #endif
 
@@ -2241,7 +2241,7 @@ void tst_QLocale::integerRoundTrip()
     QCOMPARE(locale.toString(number), numberText);
 }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 
 // Format number string according to system locale settings.
 // Expected in format is US "1,234.56".
@@ -2343,7 +2343,7 @@ void tst_QLocale::macDefaultLocale()
     QCOMPARE(locale.weekdays(), days);
 
 }
-#endif // Q_OS_MAC
+#endif // Q_OS_DARWIN
 
 #if defined(Q_OS_WIN)
 #include <qt_windows.h>
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
index ecbda7fd91..7038512cd2 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -1393,7 +1393,7 @@ void tst_QString::STL()
 
 void tst_QString::macTypes()
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
     QSKIP("This is a Mac-only test");
 #else
     extern void tst_QString_macTypes(); // in qcore_foundation.mm
diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
index 07e34b130a..62a9ab40e7 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -1140,7 +1140,7 @@ public:
 
 void tst_QFutureWatcher::warnRace()
 {
-#ifndef Q_OS_MAC //I don't know why it is not working on mac
+#ifndef Q_OS_DARWIN // I don't know why it is not working on mac
 #ifndef QT_NO_DEBUG
     QTest::ignoreMessage(QtWarningMsg, "QFutureWatcher::connect: connecting after calling setFuture() is likely to produce race");
 #endif
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 0b165f791a..e4e8d8f7ea 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -4307,7 +4307,7 @@ void tst_QDateTime::range() const
 
 void tst_QDateTime::macTypes()
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
     QSKIP("This is a Apple-only test");
 #else
     extern void tst_QDateTime_macTypes(); // in qdatetime_mac.mm