diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-08-03 12:00:41 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@theqtcompany.com> | 2016-08-12 08:30:29 +0000 |
| commit | a2ae631c04fee752e492f2c0b8fd25f06abffd6b (patch) | |
| tree | c23b323762193b93334aba8bc000687f156c0719 /src/widgets/util/qscroller.cpp | |
| parent | c38ac3dab8cbbdb494e09ccebe93c4e57a9987c3 (diff) | |
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 <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/widgets/util/qscroller.cpp')
| -rw-r--r-- | src/widgets/util/qscroller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index 270f1c5890..2adcdd018d 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -558,7 +558,7 @@ void QScroller::stop() \note Please note that this value should be physically correct. The actual DPI settings that Qt returns for the display may be reported wrongly on purpose by the underlying - windowing system, for example on OS X. + windowing system, for example on \macos. */ QPointF QScroller::pixelPerMeter() const { |