summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/multimedia-snippets
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-107-7/+7
| | | | | | 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-077-155/+155
| | | | | | | 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-077-21/+21
| | | | | | | 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-307-120/+120
| | | | | | Fix license in files having old license. Reviewed-by: Trust Me
* Merge branch '1.1' of ../qtmobility into masterAlex2011-03-085-0/+677
|\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/snippets.pro examples/sensors/reading_perf/reading_perf.pro examples/sensors/test_manual/test_manual.pro plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri tests/location-testing-tools/geoservicedemo/geoservicedemo.pro tests/location-testing-tools/mapviewer/mapviewer.pro
| * Convert snippets of code in docs to a separate snippet C++ file.Michael Goddard2011-03-025-0/+677
| | | | | | | | | | | | | | | | | | | | | | So that: a) it compiles b) it gets c++ style checked c) it can be made more consistent Task-number: QTMOBILITY-1328 Reviewed-by: Jonas Rabbe Change-Id: Ifdd8d9c41dc375b04c601585470daadb21887758
* | Doc: Fixed qdoc warnings.David Boddie2011-02-181-0/+63
|/
* Rename merrry-go-round; QtMultimedia->QtMultimediaKit.Justin McPherson2010-06-032-5/+5
|
* Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Justin McPherson2010-05-282-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/lbt/lbt.pro configure configure.bat dist/changes-1.0.0 doc/src/installation.qdoc examples/player/player.cpp plugins/declarative/declarative.pro plugins/multimedia/symbian/mmf/mmf.pro plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro src/multimedia/multimedia.pro src/multimedia/qvideooutputcontrol.cpp src/multimedia/video/qimagevideobuffer.cpp tests/auto/qaudiooutput/wavheader.h
| * Bump copyright date from 2009 to 2010dac2010-05-072-2/+2
| |
| * Renamed QtMultimedia namespace to QtMediaServicesDmytro Poplavskiy2010-04-161-4/+4
| | | | | | | | | | | | | | | | | | | | To keep in sync with Qt/MediaServices. Conflicts: examples/audiorecorder/audiorecorder.cpp plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp
| * Renamed QtMedia namespace to QtMultimediaDmytro Poplavskiy2010-04-141-4/+4
| | | | | | | | | | | | To make it compatible with Qt 4.7 Task-number: MOBILITY-763
* | QtMedia->QtMultimediaJustin McPherson2010-05-241-4/+4
| |
* | Renamed QtMultimedia namespace to QtMediaServicesDmytro Poplavskiy2010-04-161-4/+4
| | | | | | | | To keep in sync with Qt/MediaServices.
* | Renamed QtMedia namespace to QtMultimediaDmytro Poplavskiy2010-04-141-4/+4
|/ | | | | | To make it compatible with Qt 4.7 Task-number: MOBILITY-763
* Rename all instance of URI in the multimedia API to URL.Andrew den Exter2009-12-171-3/+3
|
* Remove last remanent of support for no qtmultimedia.Justin McPherson2009-12-031-5/+0
|
* Doc change to Qt Mobility multimedia. And multimedia snippets.Peter Yard2009-11-231-0/+317
|
* Doc changes towards 1.0 release.Peter Yard2009-11-201-0/+220