summaryrefslogtreecommitdiffstats
path: root/src/multimedia/mediaservices/base
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-271-9/+9
|\ | | | | | | into 4.7
| * Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
| | | | | | | | Reviewed-by:Andrew den Exter
* | MediaServices; Don't look at the debug info when looking for plugins.Justin McPherson2010-04-271-1/+5
|/ | | | Reviewed-by:Dmytro Poplavskiy
* Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| | | | | | Q_PRIVATE_SLOT declarations don't require a semi-colon. Reviewed-by: Justin McPherson
* Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1623-38/+38
| | | | Reviewed-by: Justin McPherson
* QtMediaservices -> QtMediaServices.Justin McPherson2010-04-1655-164/+164
| | | | Reviewed-by: Dmytro Poplavskiy
* Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-162-0/+8
| | | | | Conflicts: configure
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-1558-0/+13487