diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
| commit | da7d462e315fb101fc9112a294b5ca2e3bd35a75 (patch) | |
| tree | 843917c14a566949318d1e8e03aa84a6ccc041d4 /src/multimedia/doc | |
| parent | 820205e604a5f281238c23464638fdff72b969d1 (diff) | |
| parent | 6d95682d7ff282180655f2f384d8aba69c4f67af (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I639d42e78a2b85e939c9f8e9dd5da70cdc058857
Diffstat (limited to 'src/multimedia/doc')
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-examples.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-examples.qdoc b/src/multimedia/doc/src/qtmultimedia-examples.qdoc index 582efc5e1..dd35aeb1a 100644 --- a/src/multimedia/doc/src/qtmultimedia-examples.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-examples.qdoc @@ -32,6 +32,6 @@ \brief Demonstrates the multimedia functionality provided by Qt. 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. */ |