aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2014-08-30 16:20:12 +0200
committerJerome Pasion <jerome.pasion@digia.com>2014-09-05 16:47:43 +0200
commit052cd46bd5de5d86f97d12301f088c89a1eda790 (patch)
tree6a72d6e97d0f32b976485ee6bba3921cf4730741
parent07d9da673809d3b09474bb18a27b973227a33a0a (diff)
Doc: Changed instances of "Mac OS X" to "OS X".v5.4.0-alpha1
-the official name is "OS X" and this change is only for the documentation. Macros and API are untouched by this commit. Change-Id: Ibdcfe2b8460685a6f8f895548288571dbb6e8a1d Task-number: QTBUG-40759 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--README2
-rw-r--r--src/macextras/doc/src/qtmacextras-index.qdoc4
-rw-r--r--src/macextras/doc/src/qtmacextras-module-cpp.qdoc2
-rw-r--r--src/macextras/qmacfunctions.mm2
4 files changed, 5 insertions, 5 deletions
diff --git a/README b/README
index a6637d6..f66f148 100644
--- a/README
+++ b/README
@@ -1 +1 @@
-Qt Mac Extras: Platform specific components for Mac OS X.
+Qt Mac Extras: Platform specific components for OS X and iOS.
diff --git a/src/macextras/doc/src/qtmacextras-index.qdoc b/src/macextras/doc/src/qtmacextras-index.qdoc
index f0af333..62d9d38 100644
--- a/src/macextras/doc/src/qtmacextras-index.qdoc
+++ b/src/macextras/doc/src/qtmacextras-index.qdoc
@@ -41,10 +41,10 @@
/*!
\page qtmacextras-index.html
\title Qt Mac Extras
- \brief Provides functionality specific to Mac OS X and iOS operating systems.
+ \brief Provides functionality specific to the OS X and iOS operating systems.
Qt Mac Extras provide classes and functions that enable you to use
- miscellaneous functionality specific to Mac OS X and iOS operating systems.
+ miscellaneous functionality specific to the OS X and iOS operating systems.
\section1 Getting Started
diff --git a/src/macextras/doc/src/qtmacextras-module-cpp.qdoc b/src/macextras/doc/src/qtmacextras-module-cpp.qdoc
index f636fdf..4f2f9e7 100644
--- a/src/macextras/doc/src/qtmacextras-module-cpp.qdoc
+++ b/src/macextras/doc/src/qtmacextras-module-cpp.qdoc
@@ -41,7 +41,7 @@
/*!
\module QtMacExtras
\title Qt Mac Extras C++ Classes
- \brief Provides classes and functions specific to Mac OS X and iOS operating systems.
+ \brief Provides classes and functions specific to OS X and iOS operating systems.
\ingroup modules
\ingroup technology-apis
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm
index 2a76877..141d642 100644
--- a/src/macextras/qmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
\namespace QtMac
\inmodule QtMacExtras
\since 5.2
- \brief The QtMac namespace contains miscellaneous functionality specific to Mac OS X and iOS operating systems.
+ \brief The QtMac namespace contains miscellaneous functionality specific to the OS X and iOS operating systems.
\inheaderfile QtMac
*/
namespace QtMac