summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/multimedia.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| | | | Reviewed-by: Dmytro Poplavskiy
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-041-4/+14
| | | | | Conflicts: src/src.pro
* Fix build of importsTobias Hunger2010-03-021-0/+63
* Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree