Replace MAC OS X with OS X

Task-number: QTBUG-46374
Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138
Reviewed-by: Martin Smith <martin.smith@digia.com>

5 files changed, 9 insertions, 9 deletions

diff --git a/examples/widgets/doc/src/application.qdoc b/examples/widgets/doc/src/application.qdoc
index e20480198a..ac32c592fc 100644
--- a/examples/widgets/doc/src/application.qdoc
+++ b/examples/widgets/doc/src/application.qdoc
@@ -232,7 +232,7 @@
 
     Just before we create the \uicontrol{Help} menu, we call
     QMenuBar::addSeparator(). This has no effect for most widget
-    styles (e.g., Windows and Mac OS X styles), but for some
+    styles (e.g., Windows and OS X styles), but for some
     styles this makes sure that \uicontrol{Help} is pushed to the right
     side of the menu bar.
 
@@ -258,7 +258,7 @@
     load the user's preferences and other application settings. The
     QSettings class provides a high-level interface for storing
     settings permanently on disk. On Windows, it uses the (in)famous
-    Windows registry; on Mac OS X, it uses the native XML-based
+    Windows registry; on OS X, it uses the native XML-based
     CFPreferences API; on Unix/X11, it uses text files.
 
     The QSettings constructor takes arguments that identify your
@@ -310,7 +310,7 @@
 
     We start by opening the file in read-only mode. The QFile::Text
     flag indicates that the file is a text file, not a binary file.
-    On Unix and Mac OS X, this makes no difference, but on Windows,
+    On Unix and OS X, this makes no difference, but on Windows,
     it ensures that the "\\r\\n" end-of-line sequence is converted to
     "\\n" when reading.
 
diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc
index 98a831da98..579dcb2055 100644
--- a/examples/widgets/doc/src/classwizard.qdoc
+++ b/examples/widgets/doc/src/classwizard.qdoc
@@ -76,7 +76,7 @@
     \endlist
 
     Although the program is just an example, if you press \uicontrol Finish
-    (\uicontrol Done on Mac OS X), actual C++ source files will actually be
+    (\uicontrol Done on OS X), actual C++ source files will actually be
     generated.
 
     \section1 The ClassWizard Class
@@ -158,7 +158,7 @@
     layouts. The \c className field is created with an asterisk (\c
     *) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that
     is, a field that must be filled before the user can press the
-    \uicontrol Next button (\uicontrol Continue on Mac OS X). The fields' values
+    \uicontrol Next button (\uicontrol Continue on OS X). The fields' values
     can be accessed from any other page using QWizardPage::field(),
     or from the wizard code using QWizard::field().
 
diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc
index 37d67334a1..29e2f2779a 100644
--- a/examples/widgets/doc/src/licensewizard.qdoc
+++ b/examples/widgets/doc/src/licensewizard.qdoc
@@ -94,7 +94,7 @@
     \snippet dialogs/licensewizard/licensewizard.cpp 4
 
     We set the style to \l{QWizard::}{ModernStyle} on all platforms
-    except Mac OS X,
+    except OS X,
 
     \snippet dialogs/licensewizard/licensewizard.cpp 5
     \snippet dialogs/licensewizard/licensewizard.cpp 6
@@ -160,7 +160,7 @@
     layouts. The fields are created with an asterisk (\c
     *) next to their name. This makes them \l{mandatory fields}, that
     is, fields that must be filled before the user can press the
-    \uicontrol Next button (\uicontrol Continue on Mac OS X). The fields' values
+    \uicontrol Next button (\uicontrol Continue on OS X). The fields' values
     can be accessed from any other page using QWizardPage::field().
 
     Resetting the page amounts to clearing the two text fields.
diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc
index a1e26272bc..cf83ea3507 100644
--- a/examples/widgets/doc/src/plugandpaint.qdoc
+++ b/examples/widgets/doc/src/plugandpaint.qdoc
@@ -162,7 +162,7 @@
     subdirectory of the Plug & Paint example. On Unix, this is just a
     matter of initializing the QDir variable with
     QApplication::applicationDirPath(), the path of the executable
-    file, and to do a \l{QDir::cd()}{cd()}. On Windows and Mac OS X,
+    file, and to do a \l{QDir::cd()}{cd()}. On Windows and OS X,
     this file is usually located in a subdirectory, so we need to
     take this into account.
 
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
index 70a8644b47..6349f7aa2e 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
@@ -68,7 +68,7 @@ static const char * const message =
     "(right-click) menu.</p>"
 
 #ifdef Q_OS_MAC
-    "<p>On Mac OS X, the \"Black\" dock widget has been created as a "
+    "<p>On OS X, the \"Black\" dock widget has been created as a "
     "<em>Drawer</em>, which is a special kind of QDockWidget.</p>"
 #endif
     ;