summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-196-115/+267
|\
| * Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-196-8/+62
| * Fix; QML Video item is sensitive to property assignment orderJustin McPherson2010-03-196-114/+212
* | Fix installation of imports librariesTobias Hunger2010-03-121-2/+2
* | Use TARGETPATH instead of hardcoding locationsTobias Hunger2010-03-101-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-082-4/+6
|\
| * doc: Fixed some QML qdoc errors.Martin Smith2010-03-052-4/+6
* | Always copy the qmldir files into the build directoryTobias Hunger2010-03-081-2/+2
|/
* Move the multimedia files to the correct place.Martin Jones2010-03-048-0/+2684
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-042-5/+26
* Fix build of importsTobias Hunger2010-03-023-0/+79