summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24256-2234/+7485
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-23256-2234/+7485
| |\
| | * Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-2319-17/+5099
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-21256-2226/+7481
| | | |\
| | | | * New configure.exe binaryMarius Storm-Olsen2010-04-211-0/+0
| | | | * Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-2118-17/+5099
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-21239-2209/+2382
| | | | |\
| | * | | \ Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-22125-1142/+2287
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Only add qvideowidget test once.Justin McPherson2010-04-211-2/+1
| | * | | | Multimedia causes build failure when Qt is configured with -embeddedKurt Korbatits2010-04-211-1/+19
| | * | | | Player demo: load not only local files but playlists and urls passed asDmytro Poplavskiy2010-04-211-5/+16
| | * | | | Gstreamer media backend: preserve playback rate after seeks and mediaDmytro Poplavskiy2010-04-211-4/+15
| | * | | | QT7 mediaservice; fix leaking strings.Justin McPherson2010-04-201-8/+7
| | * | | | Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-202-3/+2
| | * | | | Multimedia tests; fix for missing dependencyJustin McPherson2010-04-203-3/+3
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-19237-2187/+2323
| | |\ \ \ \
| | | * | | | Disabled QMediaPlayer states debug output.Dmytro Poplavskiy2010-04-191-1/+1
| | | * | | | Fixed typo in QMediaPlayer::play() error reportingDmytro Poplavskiy2010-04-191-3/+3
| | | * | | | Fixed QVideoWidget test, waiting for video surface painted.Dmytro Poplavskiy2010-04-191-1/+3
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-191-1/+1
| | | |\ \ \ \
| | | | * | | | Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| | | * | | | | Tests; Fix media tests, make sure they are using mediaservies.Justin McPherson2010-04-1917-110/+110
| | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18223-2076/+2210
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18223-2076/+2210
| | | | |\ \ \ \
| | | | | * | | | Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-167-1360/+1370
| | | | | * | | | Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-16219-719/+843
| | | | | |\ \ \ \
| | | | | | * | | | Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1627-41/+49
| | | | | | * | | | Fixed configure check for gstreamer.Dmytro Poplavskiy2010-04-161-1/+1
| | | | | | * | | | WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | | * | | | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-16121-565/+565
| | | | | | * | | | configure; Fixes for changes to use mediaservices.Justin McPherson2010-04-161-2/+2
| | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-165-4/+4
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Kurt Korbatits2010-04-161-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2dAndrew den Exter2010-04-161-0/+0
| | | | | | | * | | | | Fixed compile errors in pulseaudio backend for soundeffectKurt Korbatits2010-04-161-1/+1
| | | | | | | |/ / / /
| | | | | | | * | | | Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-153-3/+3
| | | | | | * | | | | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-1647-191/+644
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-15325-2722/+4871
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-152-24/+76
| | | | | | | |\ \ \ \ \
| | | | | | * | | | | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-15214-650/+714
| | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-142-24/+76
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Gstreamer media backend: seek to media start on end of stream.Dmytro Poplavskiy2010-04-142-24/+76
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-231-25/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7Janne Koskinen2010-04-231345-6483/+15930
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | DEF file fixJanne Koskinen2010-04-231-25/+24
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-235-82/+327
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7aavit2010-04-234-79/+317
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Avoided O(n^2) behavior in painter path clipper.Samuel Rødal2010-04-231-68/+276