diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:01 +0200 |
| commit | 237ad2f2f0850a35aec92776b968db3965d352c9 (patch) | |
| tree | 7af0cc9ff1032d46a1ab37fefd7783f49ed8c334 /examples | |
| parent | f3d6e8eed740aff58891827e0061d213a7e512cb (diff) | |
| parent | 15c849dcfded8818765e439f521a665ae12e707a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Change-Id: I127063e9dd558bcb8d46ea08fe1e4ae10af3f891
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} */ |