diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 13:57:41 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 13:57:41 (GMT) |
commit | 349b6c734aa7af85f3709312325c3b2e9abdad2b (patch) | |
tree | 2617b30b5cfeeedf3b63a7c3251779766fc1276f /tests/auto/mediaobject | |
parent | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (diff) | |
parent | 5cd971bb508e1288573d32a996183f3e9359c90e (diff) | |
download | Qt-349b6c734aa7af85f3709312325c3b2e9abdad2b.zip Qt-349b6c734aa7af85f3709312325c3b2e9abdad2b.tar.gz Qt-349b6c734aa7af85f3709312325c3b2e9abdad2b.tar.bz2 |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix Windows compilation.
Fixed race condition in raster paint engine.
Diffstat (limited to 'tests/auto/mediaobject')
0 files changed, 0 insertions, 0 deletions