diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:30:18 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:30:19 +0100 |
commit | e236de90c27acf7ef3b2d301f2f5cab958d791ef (patch) | |
tree | c103e7ac4a88338e1a416fa2ffc776db19f3e996 /src | |
parent | 8827ca857101c64bd797197876746edd76cb20c8 (diff) | |
parent | 02245571bf13e29512f096d1566d6107d5a229de (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iefedab3cfc470affbd3118a4e9eb3c892945cd2a
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index cd7a9ad5d..83b28c453 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -141,7 +141,7 @@ QSoundEffect::~QSoundEffect() /*! \fn QSoundEffect::supportedMimeTypes() - Returns a list of the supported mime types for this sound effect. + Returns a list of the supported mime types for this platform. */ QStringList QSoundEffect::supportedMimeTypes() { |