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

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
This commit is contained in:
Yoann Lopes
2015-08-24 14:31:24 +02:00
parent 31fce88b3f 008d20e0ec
commit a2244c9b7a
56 changed files with 2426 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,8 +83,6 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_audio_qml
\inqmlmodule QtMultimedia
SoundEffect is part of the \b{QtMultimedia 5.0} module.
This type allows you to play uncompressed audio files (typically WAV files) in
a generally lower latency way, and is suitable for "feedback" type sounds in
response to user actions (e.g. virtual keyboard sounds, positive or negative