summaryrefslogtreecommitdiffstats
path: root/plugins/declarative/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1012-12/+12
* Update to new license formatSergio Ahumada2012-11-0712-264/+264
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-0712-36/+36
* Enabled deployment of infixed binaries on SymbianGareth Stockwell2011-11-251-2/+4
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-11-182-98/+19
|\
| * Remove Symbian-specific capability check from QDeclarativeCameraGareth Stockwell2011-11-182-98/+19
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-10-122-3/+6
|\|
| * Connect QCamera::error signal to QDeclarativeCamera::errorGareth Stockwell2011-10-122-3/+6
* | Docs: QTMOBILITY-790. Version numbers in Mobility.Peter Yard2011-08-163-3/+269
|/
* Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-3012-204/+204
* Docs: fix qdoc errors.Peter Yard2011-05-311-23/+70
* Docs: fix qdoc errors.Peter Yard2011-05-271-10/+160
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframeworkPeter Yard2011-05-251-2/+6
|\
| * Camera QML plugin/example: Add capture key support for SymbianTuomas Viitanen2011-05-171-2/+6
* | Docs: Fix qdoc errors.Peter Yard2011-05-251-2/+2
|/
* Docs: partial fix for QML/C++ properties/enums in declarative camera example.Peter Yard2011-04-121-1/+160
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframeworkPeter Yard2011-04-011-106/+280
|\
| * Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2011-03-101-106/+288
| |\
| | * Add missing QML Camera element docs.Michael Goddard2011-03-071-106/+288
* | | Docs: updates to Multimedia QML plugin doc.Peter Yard2011-04-013-16/+151
|/ /
* | Merge branch 1.1 into master-from-1.1Qt Continuous Integration System2011-01-181-1/+1
|\|
| * QML Media elements: unload media when empty source is set.Dmytro Poplavskiy2011-01-171-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobilityAndrew den Exter2011-01-135-22/+114
|\ \
| * | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2011-01-065-22/+114
| |\|
| | * symbian: prevent application panichawcroft2010-12-232-18/+105
| | * Revert "symbian: prevent application panic"hawcroft2010-12-231-9/+0
| | * symbian: prevent application panichawcroft2010-12-231-0/+9
| | * Fix position update problem in Audio Element.Ling Hu2010-12-201-1/+1
| | * QML elements should use qmlInfo() instead of qWarning() to print out warningsJustin McPherson2010-12-162-1/+6
| | * Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1...Qt Continuous Integration System2010-12-141-1/+1
| | |\
| | | * Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1...Qt Continuous Integration System2010-12-071-1/+1
| | | |\
| | | | * QML camera: fixed focus failure indicationDmytro Poplavskiy2010-12-071-1/+1
| | * | | QTMOBILITY-493, Multimedia QML module built with wrong suffix for debug on Wi...Wolfgang Beck2010-12-141-1/+1
| | |/ /
* | / / Fix loops test failure in declarative audio element.Andrew den Exter2010-12-151-8/+7
|/ / /
* | | Merge branch 1.1 into master-from-1.1Qt Continuous Integration System2010-12-071-1/+1
|\| |
| * | Fixed spelling mistakes.Toby Tomkins2010-12-071-1/+1
| |/
* | Fix qdeclarativeaudio test failure.Andrew den Exter2010-11-251-2/+0
* | Merge remote branch 'origin/1.1' into master-from-1.1Andrew Stanley-Jones2010-11-231-4/+0
|\|
| * Enable QML Video Element on symbian, as it is now supported.hawcroft2010-11-231-4/+0
* | Fix typos in merge commitAndrew Stanley-Jones2010-11-231-2/+2
* | Merge remote branch 'origin/1.1' into master-from-1.1Andrew Stanley-Jones2010-11-224-100/+73
|\|
| * Remove intermediate state variables from media elements.Ling Hu2010-11-104-85/+65
* | Merge remote branch 'origin/1.1' into master-from-1.1Andrew Stanley-Jones2010-11-103-3/+30
|\|
| * Fix state update for audio and video elementsLing Hu2010-11-083-4/+32
* | Fix regression for loops (qdeclarativeaudio)Ling Hu2010-11-021-1/+4
* | Merge branch 'master' of ../qtmobility into master-from-1.1Justin McPherson2010-11-014-22/+29
|\ \
| * | renaming loops to loopCount for internal qdeclarative classesLing Hu2010-10-124-9/+9
| * | Modified QDeclarativeMediaBase to prevent emiting playingChanged signals duri...Ling Hu2010-10-122-17/+21
* | | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2010-10-2612-606/+257
|\ \ \ | |/ / |/| / | |/
| * Add qWarning for volume and loops properties in Audio and SoundEffect elementsLing Hu2010-10-211-0/+5