diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 10:17:52 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 10:17:52 (GMT) |
commit | 4596db451cd2c53768e42b00a4234e7de2149f39 (patch) | |
tree | 4250d4ecda16797ecacedf8e6df6408fb27e7fa6 /src/3rdparty/phonon/mmf/audioplayer.cpp | |
parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
parent | 1484008e831a6b18272babb17992c4de686da045 (diff) | |
download | Qt-4596db451cd2c53768e42b00a4234e7de2149f39.zip Qt-4596db451cd2c53768e42b00a4234e7de2149f39.tar.gz Qt-4596db451cd2c53768e42b00a4234e7de2149f39.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.
Fix a painter warning
Diffstat (limited to 'src/3rdparty/phonon/mmf/audioplayer.cpp')
0 files changed, 0 insertions, 0 deletions