AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Replace "Macintosh" with something suitable or omit it

Browse Source 
Change-Id: I3067bd7e6ae2d6d68d5232a56eaf368a0415876c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Leena Miettinen 2017-05-23 11:44:45 +02:00 committed by Simon Hausmann
parent 3d76b27118
commit b2d8e1e5be
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/doc/src/icons.qdoc
View File

@ -98,8 +98,8 @@
The application allows you to manipulate the icon size with some
predefined sizes and a spin box. The predefined sizes are style
dependent, but most of the styles have the same values: Only the
Macintosh style differ by using 32 pixels, instead of 16 pixels,
dependent, but most of the styles have the same values. Only the
\macos style differs by using 32 pixels instead of 16 pixels
for toolbar buttons. You can navigate between the available styles
using the \uicontrol View menu.

8
src/corelib/global/qnamespace.qdoc
View File

@ -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

4
src/widgets/doc/src/guibooks.qdoc
View File

@ -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.