summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-051-1/+19
|\
| * Fixed failure to store certain image formats as jpegaavit2010-03-051-1/+19
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-051-1/+5
|\ \
| * | Fixed compiler warningDmytro Poplavskiy2010-03-051-0/+1
| * | QuickTime movie view output: emit the natural size changesDmytro Poplavskiy2010-03-051-1/+4
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-051-23/+2
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-041-23/+2
| |\ \ | | |/ | |/|
| | * remove non wifi interfaces from being handled.Lorn Potter2010-03-041-22/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-031-1/+1
| | |\
| | | * fix connecting to an ID.Lorn Potter2010-03-031-1/+1
* | | | Move the multimedia files to the correct place.Martin Jones2010-03-048-2684/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-0410-1/+2686
|\ \ \ \ | |/ / /
| * | | Fix namespace qml decleration.Justin McPherson2010-03-041-2/+1
| * | | QT7 mediaservice; Fix memory leakJustin McPherson2010-03-031-0/+1
| * | | Undo a doc revert.Justin McPherson2010-03-031-1/+1
| * | | Remove dependency on declarative from multimedia.Justin McPherson2010-03-0310-5/+2711
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0310-837/+0
|\ \ \ | |/ / |/| |
| * | Moved qdeclarativemodules to importsmae2010-03-0215-2698/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-026-0/+1861
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into 4.7Warwick Allison2010-03-026-0/+1861
| | |\
| | | * Move WebView to an extension plugin.Warwick Allison2010-03-026-0/+1861
* | | | Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
* | | | Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
* | | | Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
|/ / /
* | | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-0261-279/+1310
|\ \ \ | |/ /
| * | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| * | compile fix for WinCEMaurice Kalinowski2010-03-011-1/+2
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2738-168/+437
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2738-168/+437
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2738-168/+437
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2638-168/+437
| | | | |\
| | | | | * Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-2638-168/+437
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2638-168/+437
| | | | | | |\
| | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2538-168/+437
| | | | | | | |\
| | | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingAndrew den Exter2010-02-2523-71/+202
| | | | | | | | |\
| | | | | | | | | * QT7; Fix warnings.Justin McPherson2010-02-251-31/+43
| | | | | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-255-34/+76
| | | | | | | | | |\
| | | | | | | | | | * Fixed QTMoview object leak.Dmytro Poplavskiy2010-02-252-2/+4
| | | | | | | | | | * Use the monitor color space for video output.Dmytro Poplavskiy2010-02-252-4/+34
| | | | | | | | | | * Try to start media playback on all load state changes.Dmytro Poplavskiy2010-02-252-30/+40
| | | | | | | | | * | Qt namespace fixes.Justin McPherson2010-02-2517-6/+83
| | | | | | | | | |/
| | | | | | | | * | Make the Direct Show media service compile with a Qt namespace.Andrew den Exter2010-02-251-2/+2
| | | | | | | | * | Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
| | | | | | | | * | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-251-1/+1
| | | | | | | | * | Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
| | | | | | | | |/
| | | | | | | | * QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
| * | | | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2719-83/+861
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-271-2/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-271-2/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Compile on WinCEaavit2010-02-251-2/+3
| | | | | |_|/ / | | | | |/| | |