summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudiodeviceinfo.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-08 13:22:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-08 13:22:58 (GMT)
commitf7ad03a30b69143a6670424a756d65860c428430 (patch)
tree618d6875bd4b307078202c7f859febd285a5020b /src/multimedia/audio/qaudiodeviceinfo.cpp
parentd43d9c0d273911f2222f9d79b8e028458cb7abeb (diff)
parent3abc322eb6834aa61cc77d73dbd17c4389accb00 (diff)
downloadQt-f7ad03a30b69143a6670424a756d65860c428430.zip
Qt-f7ad03a30b69143a6670424a756d65860c428430.tar.gz
Qt-f7ad03a30b69143a6670424a756d65860c428430.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
Diffstat (limited to 'src/multimedia/audio/qaudiodeviceinfo.cpp')
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 19b4669..ff04b4e 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -260,6 +260,8 @@ QStringList QAudioDeviceInfo::supportedCodecs() const
/*!
Returns a list of supported sample rates.
+
+ \since 4.7
*/
QList<int> QAudioDeviceInfo::supportedSampleRates() const
@@ -280,6 +282,8 @@ QList<int> QAudioDeviceInfo::supportedFrequencies() const
/*!
Returns a list of supported channel counts.
+
+ \since 4.7
*/
QList<int> QAudioDeviceInfo::supportedChannelCounts() const