diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-11 11:25:03 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-11 11:25:03 (GMT) |
| commit | b111d0bb1f0483d507c758810a0f247cb8dd82c0 (patch) | |
| tree | 9db9a693360c607a53d1ec8c3c421b338fb53fef /src/multimedia/audio/qaudiodeviceinfo.h | |
| parent | 3e2c214dc217ac677733e2a56ac9f17ff0c3196f (diff) | |
| parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
| download | Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.zip Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.tar.gz Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6-ce
Diffstat (limited to 'src/multimedia/audio/qaudiodeviceinfo.h')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index 53b9904..5c7cb98 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/audio/qaudiodeviceinfo.h @@ -92,7 +92,7 @@ public: static QAudioDeviceInfo defaultInputDevice(); static QAudioDeviceInfo defaultOutputDevice(); - static QList<QAudioDeviceInfo> deviceList(QAudio::Mode mode); + static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode); private: QAudioDeviceInfo(const QString &realm, const QByteArray &handle, QAudio::Mode mode); |