summaryrefslogtreecommitdiffstats
path: root/plugins/declarative/multimedia/qdeclarativevideo_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update to new license formatSergio Ahumada2012-11-071-22/+22
| | | | | | | Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6 Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-071-3/+3
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-301-17/+17
| | | | | | Fix license in files having old license. Reviewed-by: Trust Me
* Merge branch 'master' of ../qtmobility into master-from-1.1Justin McPherson2010-11-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/declarative/multimedia/qdeclarativemediabase.cpp plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp src/multimedia/effects/qsoundeffect.cpp src/multimedia/effects/qsoundeffect_p.h src/multimedia/effects/qsoundeffect_pulse_p.cpp src/multimedia/effects/qsoundeffect_pulse_p.h src/multimedia/effects/qsoundeffect_qmedia_p.cpp src/multimedia/effects/qsoundeffect_qmedia_p.h src/multimedia/effects/qsoundeffect_qsound_p.cpp src/multimedia/effects/qsoundeffect_qsound_p.h src/s60installs/bwins/QtMultimediaKitu.def src/s60installs/eabi/QtMultimediaKitu.def tests/auto/qsoundeffect/tst_qsoundeffect.cpp
| * renaming loops to loopCount for internal qdeclarative classesLing Hu2010-10-121-1/+1
| | | | | | | | Reviewed-by: Andrew den Exter
* | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2010-10-261-9/+2
|\ \ | |/ |/|
| * Remove specialized status signals from Audio and Video elements.Andrew den Exter2010-10-131-6/+0
| | | | | | | | | | Between status and state changed and the specialized state signals there are enough opportunities to handle status changes.
| * Remove the dynamic meta object for media element meta-data.Andrew den Exter2010-10-071-5/+0
| | | | | | | | | | | | | | Ultimately there's been nothing dynamic about the multimedia meta-data. So in the interest of simplicity the meta-data object we'll replace the dynamic meta-data object with a regular QObject with lots of accessor functions.
| * Fix qdoc warnings about metaData in the audio and video elements.Andrew den Exter2010-10-071-0/+4
| | | | | | | | | | | | Add a dummy MetaData class for the QML parsers benefit. Task-number: MOBILITY-1601
| * Fix data binding to an imported Audio element across contexts.Andrew den Exter2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | The meta-data dynamic meta-object didn't support parent meta-objects correctly and was setup prematurely. This technically isn't an issue prior to this patch as the dynamic meta-object is now applied to a child object and therefore not interfering, but it's still better if it's implemented correctly. Task-number: QTMOBILITY-555
* | Merge branch 'master' into seamlessloopLing Hu2010-10-071-2/+1
|\|
| * Audio QML element will not replay from endOfMedia signal.Andrew den Exter2010-10-011-2/+1
| | | | | | | | | | | | | | | | The element emitted endOfMedia before updating its internal state to a stopped state, so play() exited early thinking there was nothing to do. Task-number: MOBILITY-1538
* | Add looping for Qml Audio elementLing Hu2010-10-041-0/+1
|/
* Group the meta-data properties on the Audio and Video elements.Andrew den Exter2010-09-301-0/+1
| | | | | This creates a clear distinction between meta-data properties and other properties on the elements.
* Merge 1.0->module.Justin McPherson2010-05-271-1/+1
|
* qml multimedia element compilingKurt Korbatits2010-05-241-0/+1
|
* qml multimedia elements back to mobilityKurt Korbatits2010-05-241-0/+207
Reviewed-by:Andrew den Exter Conflicts: src/multimedia/multimedia.pro
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 00:18:20 +0000