From 15c849dcfded8818765e439f521a665ae12e707a Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 11 Aug 2016 14:59:41 +0200 Subject: Doc: Change instances of 'OS X' to 'macOS' As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except in link targets (QDoc doesn't expand macros in those). Add a 'macOS' prefix to example titles to make it clear they are specific to that platform. Change-Id: I6bac8d92ca080adf7138a12e0f792c132e382f5d Reviewed-by: Jake Petroules Reviewed-by: Leena Miettinen --- .../doc/src/qtmacextras-example-embeddedqwindow.qdoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/macextras/embeddedqwindow') diff --git a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc index 56c515e..6199a79 100644 --- a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc +++ b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc @@ -26,16 +26,16 @@ ****************************************************************************/ /*! - \title Embedded QWindow + \title macOS: Embedded QWindow \ingroup examples-qtmacextras \example embeddedqwindow - \brief Demonstrates embedding a QWindow into an view hierarchy of a Mac - OS X application. + \brief Demonstrates embedding a QWindow into an view hierarchy of a \macos + application. - This OS X-specific example shows how to create a view hierarchy + This \macos-specific example shows how to create a view hierarchy containing a QWindow, with handling of Qt's mouse and keyboard events. \include examples-run.qdocinc - \sa {Qt for OS X}, {Qt Mac Extras} + \sa {Qt for macOS}, {Qt Mac Extras} */ -- cgit v1.2.3