Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵ | Justin McPherson | 2010-04-27 | 1 | -9/+9 |
|\ | | | | | | | into 4.7 | ||||
| * | Fix up qdocs for mediaservices namespace. | Kurt Korbatits | 2010-04-27 | 1 | -9/+9 |
| | | | | | | | | Reviewed-by:Andrew den Exter | ||||
* | | MediaServices; Don't look at the debug info when looking for plugins. | Justin McPherson | 2010-04-27 | 1 | -1/+5 |
|/ | | | | Reviewed-by:Dmytro Poplavskiy | ||||
* | Fix warning about illegal empty declaration. | Andrew den Exter | 2010-04-19 | 1 | -1/+1 |
| | | | | | | Q_PRIVATE_SLOT declarations don't require a semi-colon. Reviewed-by: Justin McPherson | ||||
* | Add EXPORT defines for QtMediaServices library. | Andrew den Exter | 2010-04-16 | 23 | -38/+38 |
| | | | | Reviewed-by: Justin McPherson | ||||
* | QtMediaservices -> QtMediaServices. | Justin McPherson | 2010-04-16 | 55 | -164/+164 |
| | | | | Reviewed-by: Dmytro Poplavskiy | ||||
* | Merge branch '4.7' of ../../qt/4.7 into 4.7 | Justin McPherson | 2010-04-16 | 2 | -0/+8 |
| | | | | | Conflicts: configure | ||||
* | Create Mediaservices lib, separate from Multimedia. | Justin McPherson | 2010-04-15 | 58 | -0/+13487 |