|author||Topi Reinio <firstname.lastname@example.org>||2016-08-03 12:00:41 +0200|
|committer||Topi Reiniö <email@example.com>||2016-08-12 08:30:29 +0000|
Doc: Change instances of '(Mac) OS X' to 'macOS'
As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change the occurrences where the Mac platform is discussed to use a macro \macos, which expands to 'macOS'. This helps with adapting to future renaming. Update the instructions on mac-specific Q_OS_* macro usage. Add a \target for the old 'Qt for OS X' topic to keep links working for other documentation modules that try to link with the old name. Change-Id: Id33fb0cd985df702a4ae4efb4c5fd428e77d9b85 Reviewed-by: Leena Miettinen <firstname.lastname@example.org>
Diffstat (limited to 'src/widgets/styles/qstyle.cpp')
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 6a03d73c72..e148e5deec 100644
@@ -98,7 +98,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
The style gets all the information it needs to render the
graphical element from the QStyleOption class. The widget is
passed as the last argument in case the style needs it to perform
- special effects (such as animated default buttons on OS X),
+ special effects (such as animated default buttons on \macos),
but it isn't mandatory. In fact, QStyle can be used to draw on any
paint device (not just widgets), in which case the widget argument
is a zero pointer.
@@ -197,7 +197,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
QStyle gets all the information it needs to render the graphical
element from QStyleOption. The widget is passed as the last
argument in case the style needs it to perform special effects
- (such as animated default buttons on OS X), but it isn't
+ (such as animated default buttons on \macos), but it isn't
mandatory. In fact, you can use QStyle to draw on any paint
device, not just widgets, by setting the QPainter properly.
@@ -1718,7 +1718,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SH_Menu_SubMenuUniDirection Since Qt 5.5. If the cursor has
- to move towards the submenu (like it is on OS X), or if the
+ to move towards the submenu (like it is on \macos), or if the
cursor can move in any direction as long as it reaches the
submenu before the sloppy timeout.