summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-20 20:14:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-20 20:14:20 (GMT)
commit2e7c9082fd472911e61e265eb184f408b8ac62e4 (patch)
tree48d30c86d6c126eee077847beea8b02b5f15367d /src/corelib
parentdb87996d4ca90f8fffb5a8e012fa7f2336c038b0 (diff)
parentcddc591fc4c6317bca83c081a62b84c15a0644d1 (diff)
downloadQt-2e7c9082fd472911e61e265eb184f408b8ac62e4.zip
Qt-2e7c9082fd472911e61e265eb184f408b8ac62e4.tar.gz
Qt-2e7c9082fd472911e61e265eb184f408b8ac62e4.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')
0 files changed, 0 insertions, 0 deletions