diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 20:57:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 20:57:24 (GMT) |
| commit | 1d222c8b93fd37921fdcf2baa69c5dc110fdc31f (patch) | |
| tree | 55966841b5802fafaf793d7a9c75adf88fc08a3e /src/multimedia | |
| parent | 9aef5ac9fd2452657ca018325db54e374bdeb164 (diff) | |
| parent | 2fa8b39c8a687550934e9668384f0bbe9f56f550 (diff) | |
| download | Qt-1d222c8b93fd37921fdcf2baa69c5dc110fdc31f.zip Qt-1d222c8b93fd37921fdcf2baa69c5dc110fdc31f.tar.gz Qt-1d222c8b93fd37921fdcf2baa69c5dc110fdc31f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix autotest
Adapt the TapAndHold recognizer to non-touch too
add setNativeArguments() and nativeArguments()
fix bogus return value from qprocess::execute()
qdoc: Simplified code to enable fixing of QTBUG-6340.
Doc: fixing img style
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions