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

Merge remote-tracking branch 'origin/5.3' into 5.4

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
This commit is contained in:
Sergio Ahumada
2014-09-26 15:28:44 +02:00
parent 5c3a5cf810 e195b7fc05
commit 41a1c16340
21 changed files with 213 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/multimedia/audio/qsoundeffect_qaudio_p.cpp
View File

@@ -45,9 +45,6 @@
#include "qsoundeffect_qaudio_p.h"
#include <QtCore/qcoreapplication.h>
#include <QtCore/qthread.h>
#include <QtCore/qmutex.h>
#include <QtCore/qwaitcondition.h>
#include <QtCore/qiodevice.h>
//#include <QDebug>