Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iefedab3cfc470affbd3118a4e9eb3c892945cd2a
This commit is contained in:
Frederik Gladhorn
2014-01-06 16:30:18 +01:00

View File

@@ -141,7 +141,7 @@ QSoundEffect::~QSoundEffect()
/*! /*!
\fn QSoundEffect::supportedMimeTypes() \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() QStringList QSoundEffect::supportedMimeTypes()
{ {