diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 18:41:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 18:41:43 (GMT) |
| commit | 1ba21662a208dc50cd2d7c47fa4cdd3dd07c1617 (patch) | |
| tree | 15d20c3a73f1ead56821395952bfe630476ee36e /src/3rdparty/phonon | |
| parent | c768371b6b7d7de8d758079b7e5d82226e9f5798 (diff) | |
| parent | 253b87180e0a6c5db0feaaed7e321139c4ff1643 (diff) | |
| download | Qt-1ba21662a208dc50cd2d7c47fa4cdd3dd07c1617.zip Qt-1ba21662a208dc50cd2d7c47fa4cdd3dd07c1617.tar.gz Qt-1ba21662a208dc50cd2d7c47fa4cdd3dd07c1617.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/3rdparty/phonon')
0 files changed, 0 insertions, 0 deletions