diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:36 +0100 |
| commit | 844ad02c5d7ba8feec23f51a6338d1a202d6fc60 (patch) | |
| tree | 523f60d882bd71b1d0e1340383fe39843a94ed1e /examples | |
| parent | 57b5739923a741aa4317c11c5e86c911cc25f798 (diff) | |
| parent | f48a3333637199e5335e22bfac39ea7c35b44e49 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ica8ae5b03d57d4bf043644e8818523e68c959c57
Diffstat (limited to 'examples')
3 files changed, 10 insertions, 10 deletions
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} */ diff --git a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc index 38c828a..d51df16 100644 --- a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc +++ b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \title Mac Functions + \title macOS Functions \ingroup examples-qtmacextras \example macfunctions \brief Demonstrates using functions from the QtMac namespace. @@ -36,5 +36,5 @@ \include examples-run.qdocinc - \sa {Qt for OS X}, {Qt Mac Extras} + \sa {Qt for macOS}, {Qt Mac Extras} */ diff --git a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc index 683d1d0..9567f66 100644 --- a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc +++ b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc @@ -26,19 +26,19 @@ ****************************************************************************/ /*! - \title Mac Pasteboard MIME Converter + \title macOS: Pasteboard MIME Converter \ingroup examples-qtmacextras \example macpasteboardmime \brief Demonstrates using QMacPasteboardMime class. This example shows how to use QMacPasteboardMime to do conversion between a MIME type and a Uniform Type Identifier (UTI) format used - on OS X. + on \macos. The example creates a widget that accepts drag & drop events, and reads contents of dropped business cards in vCard format. \include examples-run.qdocinc - \sa {Qt for OS X}, {Qt Mac Extras} + \sa {Qt for macOS}, {Qt Mac Extras} */ |