slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Doc: Change instances of 'OS X' to 'macOS'

Browse Source 
As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the platform is
discussed to use the macro \macos (defined in the documentation
configuration in qtbase).

Change-Id: I1ba3b1e3c11870523516d3a13790d40dd0803aad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Topi Reinio
2016-08-12 11:09:56 +02:00
committed by Topi Reiniö
parent c30eeb5b74
commit 57b1dc867c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/audio/qaudiosystemplugin.cpp
View File

@@ -66,7 +66,7 @@ QAudioSystemFactoryInterface::~QAudioSystemFactoryInterface()
\sa QAbstractAudioDeviceInfo, QAbstractAudioOutput, QAbstractAudioInput \sa QAbstractAudioDeviceInfo, QAbstractAudioOutput, QAbstractAudioInput
Qt supports win32, linux(alsa) and OS X standard (builtin to the Qt supports win32, linux(alsa) and \macos standard (builtin to the
QtMultimedia library at compile time). QtMultimedia library at compile time).
You can support other backends other than these predefined ones by You can support other backends other than these predefined ones by

2
src/multimedia/doc/src/qtmultimedia-examples.qdoc
View File

@@ -32,6 +32,6 @@
\brief Demonstrates the multimedia functionality provided by Qt. \brief Demonstrates the multimedia functionality provided by Qt.
The \l{Qt Multimedia} module provides low-level audio support on Linux, The \l{Qt Multimedia} module provides low-level audio support on Linux,
Windows and OS X. It also provides audio plugin API to allow developers Windows and \macos. It also provides audio plugin API to allow developers
implement their own audio support for custom devices and platforms. implement their own audio support for custom devices and platforms.
*/ */

2
src/multimedia/video/qabstractvideobuffer.cpp
View File

@@ -92,7 +92,7 @@ int QAbstractVideoBufferPrivate::map(
\value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer. \value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer.
\value GLTextureHandle The handle of the buffer is an OpenGL texture ID. \value GLTextureHandle The handle of the buffer is an OpenGL texture ID.
\value XvShmImageHandle The handle contains pointer to shared memory XVideo image. \value XvShmImageHandle The handle contains pointer to shared memory XVideo image.
\value CoreImageHandle The handle contains pointer to OS X CIImage. \value CoreImageHandle The handle contains pointer to \macos CIImage.
\value QPixmapHandle The handle of the buffer is a QPixmap. \value QPixmapHandle The handle of the buffer is a QPixmap.
\value EGLImageHandle The handle of the buffer is an EGLImageKHR. \value EGLImageHandle The handle of the buffer is an EGLImageKHR.
\value UserHandle Start value for user defined handle types. \value UserHandle Start value for user defined handle types.