diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2017-05-23 11:44:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-23 13:02:33 +0000 |
| commit | b2d8e1e5be8508a9a312c070ceb8c77b9497a705 (patch) | |
| tree | 85e8441d36af2fac77b540b3586d73154c6f4a46 /src | |
| parent | 3d76b2711807b601d048b703883a72deced7ac66 (diff) | |
Doc: Replace "Macintosh" with something suitable or omit it
Change-Id: I3067bd7e6ae2d6d68d5232a56eaf368a0415876c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 8 | ||||
| -rw-r--r-- | src/widgets/doc/src/guibooks.qdoc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 463a9936f6..c030baa05c 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -364,7 +364,7 @@ \omitvalue KeyboardModifierMask \note On \macos, the \c ControlModifier value corresponds to - the Command keys on the Macintosh keyboard, and the \c MetaModifier value + the Command keys on the keyboard, and the \c MetaModifier value corresponds to the Control keys. The \c KeypadModifier value will also be set when an arrow key is pressed as the arrow keys are considered part of the keypad. @@ -382,7 +382,7 @@ supported by Qt. \note On \macos, the \c CTRL value corresponds to - the Command keys on the Macintosh keyboard, and the \c META value + the Command keys on the keyboard, and the \c META value corresponds to the Control keys. \value SHIFT The Shift keys provided on all standard keyboards. @@ -2084,12 +2084,12 @@ We refer to a top-level window that has a parent as a \e secondary window. - \value Sheet Indicates that the window is a Macintosh sheet. Since + \value Sheet Indicates that the window is a sheet on \macos. Since using a sheet implies window modality, the recommended way is to use QWidget::setWindowModality(), or QDialog::open(), instead. - \value Drawer Indicates that the widget is a Macintosh drawer. + \value Drawer Indicates that the widget is a drawer on \macos. \value Popup Indicates that the widget is a pop-up top-level window, i.e. that it is modal, but has a window diff --git a/src/widgets/doc/src/guibooks.qdoc b/src/widgets/doc/src/guibooks.qdoc index 5f68344758..30ffd0b5ec 100644 --- a/src/widgets/doc/src/guibooks.qdoc +++ b/src/widgets/doc/src/guibooks.qdoc @@ -58,7 +58,7 @@ alphabetical dictionary of widgets and other user interface elements, with comprehensive coverage of each. Each chapter covers one widget or other element, contains the most important recommendation from the - Macintosh, Windows and Motif style guides, notes about common + \macos, Windows and Motif style guides, notes about common problems, comparison with other widgets that can serve some of the same roles as this one, etc. @@ -72,7 +72,7 @@ \b{\l{http://www.amazon.com/exec/obidos/ASIN/0201622165/trolltech/t}{Macintosh Human Interface Guidelines}}, Second Edition, ISBN 0-201-62216-5, is worth buying for the \e {don't}s alone. Even - if you're not writing Macintosh software, avoiding most of what it + if you are not writing software for \macos, avoiding most of what it advises against will produce more easily comprehensible software. Doing what it tells you to do may also help. |