summaryrefslogtreecommitdiffstats
path: root/src/multimedia/effects/effects.pri
Commit message (Collapse)AuthorAgeFilesLines
* Fix effects.pri.Justin McPherson2010-03-081-2/+2
| | | | Reviewed-by: Dmytro Poplavskiy
* Finish to resolve merge conflict.Olivier Goffart2010-03-041-10/+11
| | | | | Move the change that were made in commit 9957e85e37345e946ecc67196d65fbca867a2001 from src/multimedia/qml/qml.pri to src/multimedia/effects/effects.pri
* Remove dependency on declarative from multimedia.Justin McPherson2010-03-031-0/+24
Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter