Merge branch 'release' into stable

Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
This commit is contained in:
Sergio Ahumada
2013-01-29 15:21:05 +01:00
6 changed files with 44 additions and 9 deletions

View File

@@ -66,6 +66,7 @@ struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface
virtual QAbstractAudioInput* createInput(const QByteArray& device) = 0;
virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = 0;
virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) = 0;
virtual ~QAudioSystemFactoryInterface();
};
#define QAudioSystemFactoryInterface_iid \