Replace MAC OS X with OS X

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

6 files changed, 10 insertions, 10 deletions

diff --git a/src/widgets/doc/snippets/macmainwindow.mm b/src/widgets/doc/snippets/macmainwindow.mm
index e1df77089c..d0d74631ab 100755
--- a/src/widgets/doc/snippets/macmainwindow.mm
+++ b/src/widgets/doc/snippets/macmainwindow.mm
@@ -269,7 +269,7 @@ MacMainWindow::MacMainWindow()
     textedit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     textedit->setText("<br><br><br><br><br><br><center><b>This demo shows how to create a \
                        Qt main window application that has the same appearance as other \
-                       Mac OS X applications such as Mail or iTunes. This includes \
+                       OS X applications such as Mail or iTunes. This includes \
                        customizing the item views and QSplitter and wrapping native widgets \
                        such as the search field.</b></center>");
 
diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc
index 3b0d841d53..6895466977 100644
--- a/src/widgets/doc/src/graphicsview.qdoc
+++ b/src/widgets/doc/src/graphicsview.qdoc
@@ -491,7 +491,7 @@
           not supported. For example, you can create decorated windows by
           passing the Qt::Window window flag to QGraphicsWidget's constructor,
           but Graphics View currently doesn't support the Qt::Sheet and
-          Qt::Drawer flags that are common on Mac OS X.
+          Qt::Drawer flags that are common on OS X.
 
           The capabilities of QGraphicsWidget are expected to grow depending
           on community feedback.
diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index 7add31a194..d7a2361dda 100644
--- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
@@ -162,13 +162,13 @@
     \section2 The User Rotates the Mouse Wheel
 
     On Microsoft Windows, mouse wheel usage is always handled by the
-    widget that has keyboard focus. On Mac OS X and X11, it's handled by
+    widget that has keyboard focus. On OS X and X11, it's handled by
     the widget that gets other mouse events.
 
     The way Qt handles this platform difference is by letting widgets move
     the keyboard focus when the wheel is used. With the right focus policy
     on each widget, applications can work idiomatically correctly on
-    Windows, Mac OS X, and X11.
+    Windows, OS X, and X11.
 
     \section2 The User Moves the Focus to This Window
 
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index c15281cb69..0a5a079969 100644
--- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -115,7 +115,7 @@
 
     The widget is passed as the last argument in case the style needs
     it to perform special effects (such as animated default buttons on
-    Mac OS X), but it isn't mandatory.
+    OS X), but it isn't mandatory.
 
     In the course of this section, we will look at the style elements,
     the style options, and the functions of QStyle. Finally, we describe
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 8dbc716027..fc3ac345a8 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -80,7 +80,7 @@
     the QPalette::Button role to red for a QPushButton to obtain a
     red push button. However, this wasn't guaranteed to work for all
     styles, because style authors are restricted by the different
-    platforms' guidelines and (on Windows XP and Mac OS X) by the
+    platforms' guidelines and (on Windows XP and OS X) by the
     native theme engine.
 
     Style sheets let you perform all kinds of customizations that are
@@ -121,7 +121,7 @@
     \row \li \inlineimage stylesheet-coffee-cleanlooks.png
          \li \inlineimage stylesheet-pagefold-mac.png
     \row \li Coffee theme running on Ubuntu Linux
-         \li Pagefold theme running on Mac OS X
+         \li Pagefold theme running on OS X
     \endtable
 
     When a style sheet is active, the QStyle returned by QWidget::style()
@@ -130,7 +130,7 @@
     otherwise forwards the drawing operations to the underlying,
     platform-specific style (e.g., QWindowsXPStyle on Windows XP).
 
-    Since Qt 4.5, Qt style sheets fully supports Mac OS X.
+    Since Qt 4.5, Qt style sheets fully supports OS X.
 
 */
 
@@ -3745,7 +3745,7 @@
     \snippet code/doc_src_stylesheet.qdoc 135
 
     If you want the scroll buttons of the scroll bar to be placed together
-    (instead of the edges) like on Mac OS X, you can use the following
+    (instead of the edges) like on OS X, you can use the following
     stylesheet:
     \snippet code/doc_src_stylesheet.qdoc 136
 
diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc
index 1734f57712..a337a7a487 100644
--- a/src/widgets/doc/src/widgets-tutorial.qdoc
+++ b/src/widgets/doc/src/widgets-tutorial.qdoc
@@ -110,7 +110,7 @@
        make sure that the executable is on your path, or enter its
        full location.
 
-    \li On Linux/Unix and Mac OS X, type \c make and press
+    \li On Linux/Unix and OS X, type \c make and press
        \uicontrol{Return}; on Windows with Visual Studio, type \c nmake and
        press \uicontrol{Return}.