summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2018-10-04 17:11:06 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2018-10-09 13:41:29 +0000
commit8169608eb16311ba6998df827895e7ca9b8b3e17 (patch)
tree384d5d8802a7f6f574897a6f78105d4883498b14
parent510c066b66e4cfa7a0ffa1eedb53153f7c79315b (diff)
Fix macOS naming in documentation
Change-Id: I8fc985bb5de41a40f8b2ed8208bde7b82be457ec Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
-rw-r--r--doc/src/platforms/macos.qdoc (renamed from doc/src/platforms/osx.qdoc)10
-rw-r--r--doc/src/userinterfaces.qdoc2
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/macos.qdoc
index d60c33547..1521e2cda 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/macos.qdoc
@@ -26,11 +26,11 @@
****************************************************************************/
/*!
- \page osx.html
+ \page macos.html
\title Qt for macOS
\brief Platform support for \macos.
\ingroup supportedplatform
- \keyword Qt for OS X
+ \keyword Qt for macOS
\macos (previously known as OS X or Mac OS X) is a UNIX platform and
behaves similarly to other Unix-like platforms. The main difference is
@@ -163,7 +163,7 @@
*/
/*!
- \page osx-building.html
+ \page macos-building.html
\title Qt for macOS - Building from Source
\brief How to install Qt on \macos.
@@ -298,7 +298,7 @@
*/
/*!
- \page osx-issues.html
+ \page macos-issues.html
\title Qt for macOS - Specific Issues
\brief A description of issues with Qt that are specific to \macos.
@@ -680,7 +680,7 @@
*/
/*!
- \page osx-deployment.html
+ \page macos-deployment.html
\title Qt for macOS - Deployment
\brief Describes the deployment process for \macos.
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index aa99c28d0..3148e0997 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -88,7 +88,7 @@ For more about how to create application user interfaces with QML, visit the
\l {Qt Widgets} are traditional user interface elements that are typically found
in desktop environments. The widgets integrate well to the underlying platform
-providing native look'n'feel on Windows, Linux and Mac OSX. The widgets are mature
+providing native look'n'feel on Windows, Linux and \macos. The widgets are mature
and feature rich user interface elements suitable for mostly static user interfaces.
In contrast to \l {Qt Quick}, the widgets do not scale that well for touch screens
and fluid, highly animated modern user interfaces. The widgets are a good choice