summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-08-131-14/+11
|\
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-14/+11
| |\
| | * Fixed bug in QWaveDecoder.Yoann Lopes2013-08-051-14/+11
* | | Doc: Renamed HTML file for "Qt Multimedia on Windows" page.Jerome Pasion2013-08-121-1/+1
|/ /
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-8/+47
|\|
| * Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
* | Doc: Setting \qtvariable values in module pages.Jerome Pasion2013-08-021-0/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-2/+2
|\|
| * Android: removed unnecessary init class for QtMultimedia.jarYoann Lopes2013-07-091-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-272-11/+18
|\|
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-251-1/+6
| |\
| | * Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-211-1/+6
| * | Use correct default audio output and input devices on Windows.Yoann Lopes2013-06-251-10/+12
* | | Doc: Setting navigation variables for Multimedia and Multimedia WidgetsJerome Pasion2013-06-261-0/+4
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-205-8/+69
|\| |
| * | Doc: Fix some broken links and quote pathsSze Howe Koh2013-06-131-3/+3
| |/
| * Doc: Add Qt Multimedia platform notes for Windowsv5.1.0-rc1Topi Reinio2013-06-042-0/+58
| * Doc: Adding import statement for in Qt Multimedia QML TypesJerome Pasion2013-06-031-4/+7
| * Fix typo in QMediaPlayer docs.Mitch Curtis2013-05-311-1/+1
* | Purged ALSA implementationBernd Weimer2013-06-112-153/+75
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-042-3/+4
|\|
| * Doc: Removed multimedia overview from "technology-apis" group.Jerome Pasion2013-05-241-2/+0
| * Android: add libQt5MultimediaQuick_p to the list of dependencies.Christian Strømme2013-05-231-1/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-235-17/+23
|\|
| * Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-142-2/+1
| * Doc: Define example install paths in .qdocconfTopi Reinio2013-05-031-0/+3
| * Make it possible to bundle Android buildsEskil Abrahamsen Blomfeldt2013-05-031-0/+4
| * Doc: Fix example paths referred in documentationTopi Reinio2013-04-301-15/+15
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-295-66/+82
|\|
| * Doc: Several cosmetic doc fixes.Jerome Pasion2013-04-233-50/+65
| * Reset VideoSurface pointer when deletedDominik Holland2013-04-231-1/+2
| * Doc: Fix module names in .qdocconf for Qt Multimedia & WidgetsTopi Reinio2013-04-191-15/+15
* | Delay deletion of the QNetworkAccessManager.Stephen Kelly2013-04-111-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-271-3/+5
|\|
| * Fix calculation bug in QWaveDecoder.Christian Strømme2013-03-221-3/+5
* | Add autoOrientation property to QDeclarativeVideoOutputTobias Koenig2013-03-194-1/+160
|/
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-142-29/+36
|\
| * Doc: Clarify and polish docs for QAudio[Input|Output]::start()Sze Howe Koh2013-02-272-29/+36
* | iOS: Fix build issuesAndy Nichols2013-03-112-9/+9
* | Android multimedia plug-in.Christian Strømme2013-03-061-0/+5
* | Doc: Adding Qt Multimedia Widgets documentation.Jerome Pasion2013-02-262-3/+5
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-19262-330/+348
|\|
| * Doc: Fix faulty snippet in Video Overview pageTopi Reinio2013-02-191-1/+5
| * Fix lupdate-Warning in qcamera.cpp.Friedemann Kleint2013-02-061-1/+1
| * fix doc page urlsOswald Buddenhagen2013-02-061-1/+1
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-2/+2
| * Add a simple accessor to the video provider snippetLaszlo Papp2013-02-061-1/+3
| * Merge branch 'release' into stableSergio Ahumada2013-01-295-2/+12
| |\
| | * Doc: Add QML Types to table of contents in AssistantJerome Pasion2013-01-281-1/+1
| | * Add virtual destructors to two classes with other virtualsThiago Macieira2013-01-254-0/+10