diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-10 07:37:47 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-10 07:37:47 (GMT) |
| commit | 56a50deeb27032bd2125a6950a8044d77513a0fd (patch) | |
| tree | a7539e3d9467df032ab4c5811da3ad9e5b4a784e /src/multimedia/audio/qaudiodevicefactory_p.h | |
| parent | 81f3b28f2f82b15f9d255ec38abdc5f749b8809c (diff) | |
| parent | 6da8c83d8b5465cf9b767f288d3ebfa0727085c2 (diff) | |
| download | Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.zip Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.tar.gz Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/multimedia/audio/qaudiodevicefactory_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudiodevicefactory_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h index 008e4a8..2466455 100644 --- a/src/multimedia/audio/qaudiodevicefactory_p.h +++ b/src/multimedia/audio/qaudiodevicefactory_p.h @@ -72,7 +72,7 @@ class QAbstractAudioDeviceInfo; class QAudioDeviceFactory { public: - static QList<QAudioDeviceInfo> deviceList(QAudio::Mode mode); + static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode); static QAudioDeviceInfo defaultInputDevice(); static QAudioDeviceInfo defaultOutputDevice(); |