diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:16 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:16 +0200 |
| commit | 872f0de43ea49ac5bac9ca956a65c384649bb92b (patch) | |
| tree | b4114a01f85e7adeca8f67e18b2246969c965361 /src/multimedia/doc/src | |
| parent | 4819f9090433a8743d1a0703330091eb5689679a (diff) | |
| parent | 3c54acb6f7ab082e3c7881701b84593c6372ef6c (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I957b44c06fca7a3f552edc18f286de043d31e42d
Diffstat (limited to 'src/multimedia/doc/src')
| -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 f809edf27..582efc5e1 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 Mac OS X. It also provides audio plugin API to allow developers + Windows and OS X. It also provides audio plugin API to allow developers implement their own audio support for custom devices and platforms. */ |