summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-20 16:24:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-20 16:24:26 (GMT)
commitcddc591fc4c6317bca83c081a62b84c15a0644d1 (patch)
treec691310c1e78cc4a101c130860a32c9c33d4c6d6 /src/corelib/global
parent1108a20ee3e4190d58dce1efe0a0bf0b3f88491d (diff)
parent8dd178b5143c31cecb4225f33447f6a88ae45a21 (diff)
downloadQt-cddc591fc4c6317bca83c081a62b84c15a0644d1.zip
Qt-cddc591fc4c6317bca83c081a62b84c15a0644d1.tar.gz
Qt-cddc591fc4c6317bca83c081a62b84c15a0644d1.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioDeviceInfo::nearestFormat() consistent across all platforms The documentation for processedUSecs() is ambiguous
Diffstat (limited to 'src/corelib/global')
0 files changed, 0 insertions, 0 deletions