diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 23:28:14 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 23:28:14 (GMT) |
commit | 19a566f82a7c684423331a8caab70ec594afd1ce (patch) | |
tree | 15d20c3a73f1ead56821395952bfe630476ee36e /src/multimedia/audio/qaudiooutput_win32_p.cpp | |
parent | c768371b6b7d7de8d758079b7e5d82226e9f5798 (diff) | |
parent | 1ba21662a208dc50cd2d7c47fa4cdd3dd07c1617 (diff) | |
download | Qt-19a566f82a7c684423331a8caab70ec594afd1ce.zip Qt-19a566f82a7c684423331a8caab70ec594afd1ce.tar.gz Qt-19a566f82a7c684423331a8caab70ec594afd1ce.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set
Fix painting artifacts on text
Prevented unnecessary copy in QImage::setAlphaChannel().
Change the ifdef for resolving function ptrs to match declaration
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_win32_p.cpp')
0 files changed, 0 insertions, 0 deletions