summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-302-1/+7
|\
| * Make QDeclarativeParserStatus method pure virtual to encourage right code.Warwick Allison2010-04-302-1/+7
* | update multimedia qml element doc samplesKurt Korbatits2010-04-272-2/+33
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-239-162/+162
|\
| * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-168-161/+161
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-152-2/+2
| |\
| * | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-159-162/+162
* | | More QML doc consistency.Martin Jones2010-04-162-13/+13
* | | Simplify QML import plugin deployment linesJoona Petrell2010-04-161-2/+1
| |/ |/|
* | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-142-2/+2
|/
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-012-0/+10
|\
| * Add media elements to the QML Elements docs.Martin Jones2010-04-012-0/+10
* | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-311-1/+1
|/
* Fix installation of qmldir filesAlan Alpert2010-03-301-1/+1
* Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+11
* doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-242-2/+2
* Rename m_volume to m_volThiago Macieira2010-03-202-6/+6
* 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