summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix multiple documentation issuesv5.13.0-beta3Topi Reinio2019-04-164-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | - GstTools has some (internal) documentation, but was causing a number of warnings with QDoc's clang parser - exclude it from the documentation build. - Remove direct links from example documentation to individual example files; they no longer work. - Fix navigation for QML types; The main QML types pages did not list types for QtAudioEngiine. - Use \QtMinorVersion macro to make the documented import versions follow the minor Qt version. - Fix \since usage to be consistent throughout. - Fix linking issues for QML properties/methods - Minor language fixes Change-Id: I735cd13fa6dedd6bf06d6b6ef50ce2e0d69a545b Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-022-4/+4
|\ | | | | | | Change-Id: Ia2f6f90c44bb360810124bcfab558661a2644880
| * Doc: Fix documented QtMultimedia importKai Koehne2019-02-262-4/+4
| | | | | | | | | | | | | | | | Since change 871a097d0c6e8203f82 QtMultimedia is registered with the latest Qt minor version, but the documentation wasn't updated yet. Change-Id: I58eb629c5a2851f83231891b2e219210d79c862c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | QML: Make QtAudioEngine import available under 1.QT_MINOR_VERSIONVaL Doroshchuk2019-02-262-7/+7
|/ | | | | | | | | | Made the QtAudioEngine import always available under the latest Qt minor version import QtAudioEngine 1.13 for 5.13 Task-number: QTBUG-74031 Change-Id: I14f602a5c59a6a6906aeeda8644e64dae36312e3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Doc: Move the literal codeblocks to snippet filesVenugopal Shivashankar2018-06-214-1/+68
| | | | | Change-Id: Icd9dff16b807d0bc7143a3d41f9799432035fa54 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix documentation warningsTopi Reinio2018-04-192-0/+6
| | | | | | | | | | | | Add a custom module header, used only for documentation builds, that pulls in also the QtMultimediaWidgets module. Several documentation fixes to clean up warnings from clang. Task-number: QTBUG-67790 Change-Id: I6c1013798a648250c8555eb92684ec3b33ff7531 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* QSound(Effect): Convert to functor-style connectAndre Hartmann2018-03-271-3/+3
| | | | | Change-Id: Ie58ee30b1ace836c620812b8063246c0d01d7214 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-0/+9
|\ | | | | | | Change-Id: I7566f543ce11ff6cddc4d17e2c258a582f365b65
| * Document licensesKai Koehne2018-01-181-0/+9
| | | | | | | | | | Change-Id: I827a8de356f42217a64191a467fa850e3eb6f4ef Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-101-0/+3
|/ | | | | | | | | | Previously the list was maintained in qtbase. Also, add highlighting for 'Media Player Example'. Task-number: QTBUG-60627 Change-Id: I030863ac89e2bac6a2322a52afaece2cc1c8dcd3 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* Fix outdated BSD license headerKai Koehne2017-10-181-3/+13
| | | | | Change-Id: I386d30a54819bae016cb50cf5892a5ac380288f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix outdated FDL license headerKai Koehne2017-10-1815-45/+45
| | | | | Change-Id: I9cd7043058352ba2aeded74f86d863fca29bd37d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* doc: add platform specific notes for iOSRichard Moe Gustavsen2017-02-142-0/+44
| | | | | Change-Id: I5635f4d5ec4b86a3e8be1e74b58b46359ac17df4 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Remove Blackberry specific code pathsLars Knoll2016-11-142-87/+0
| | | | | Change-Id: I187085984eb1b25d7f3de163dc05122df1259720 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Bump QML module version in documentationYoann Lopes2016-09-263-4/+4
| | | | | Change-Id: I2c3574e2a5cf46ecc9719111b5293b67583d006c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-233-4/+4
|\ | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| * Fix QML module version in documentationYoann Lopes2016-09-223-4/+4
| | | | | | | | | | | | | | Upated to 5.7 from 5.6. Change-Id: Ife0bc905aa81a8e776c5fc3eeafbc5706e5352d3 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-011-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiosystemplugin.cpp src/plugins/directshow/helpers/directshowobject.cpp src/plugins/directshow/player/directshowiosource.cpp src/plugins/directshow/player/directshowiosource.h Change-Id: I0e4632c7705128f81429ddbcb0d4abbc04858a8b
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-271-1/+1
| |\ | | | | | | | | | Change-Id: I639d42e78a2b85e939c9f8e9dd5da70cdc058857
| | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I1ba3b1e3c11870523516d3a13790d40dd0803aad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Add LogarithmicVolumeScale to VolumeScale enum.Yoann Lopes2016-06-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I0b556b5f705825fc8c8135305bda4bc860ffbf14 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Add new volume conversion API.Yoann Lopes2016-06-031-0/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | All Qt Multimedia volume APIs expect a linear volume factor. However, UI volume controls should typically use a logarithmic or cubic scale to match how the human ear perceives loudness. The new helper function (C++ and QML) provides a way to do the conversion from one scale to another. Change-Id: If7795426b728ab0e8fd6635988dbc9be795e3e5e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-3/+0
|\| | | | | | | Change-Id: Ib95ddbbc6e2b69663597cae045ec81eda6d12d58
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-3/+0
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ic272c741ca0bb805dc50ce591ac0ea1d93f07944 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-083-0/+0
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I2ac34243ebe39c93860c5ac595c2f1eca4322eb8 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-214-7/+7
|\| | | | | | | Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
| * Update version number in QML plugins.v5.6.0Yoann Lopes2016-02-254-7/+7
| | | | | | | | | | | | | | | | | | Also removes unnecessary references of that import version in the documentation and snippets. The import version is always displayed at the top of every doc page anyway. Change-Id: Ifbf4666e0bc333c51f51104a5720b988e8c04d0b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-196-84/+120
|/ | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I324f65c61171f36641472964d095d72e452afb3a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Doc: Generate separate listing of Widgets classes in the QHPTopi Reinio2016-01-121-3/+9
| | | | | | | | | Use the new QHP selection format to separately list the members of Qt Multimedia and Qt Multimedia Widgets modules in the table of contents. Change-Id: I50be80a820111834207967eada0865d212be98a8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Fix documentation warningsTopi Reinio2016-01-084-25/+19
| | | | | | | | | | - Fix incorrect paths passed to \example command - Fix resulting linking issues - Fix examplesinstallpath in .qdocconf - Remove unnecessary group definition Change-Id: I72a437ac6d297f3c63d4f29a0e3110971d1e330f Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Move all doc artifacts under one projectVenugopal Shivashankar2015-12-074-41/+41
| | | | | | | | | Although the Qt Multimedia module has two submodules, a single project is sufficient to document these submodules, avoiding unnecessary maintenance overhead. Change-Id: I8fab48241b5c9aba35890a8aaa28ce7154f78c45 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Doc: Exclude outdated content using \omit commandVenugopal Shivashankar2015-11-251-3/+2
| | | | | | Change-Id: Ifb30e398b57550788dab6955e3eac80949d47248 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: Idb61addec1cc8a01c31cfa05a2424a2b4ac85a91 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-246-22/+15
|\ | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * Fix qdoc warnings.Yoann Lopes2015-08-111-3/+9
| | | | | | | | | | Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-116-19/+6
| | | | | | | | | | | | | | | | | | And remove import statements from snippets. Change-Id: I109beabd445186f96f0750b6f23fb623c125181e Task-number: QTBUG-47620 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Added new playlist QML type.Loïc Molinari2015-08-101-0/+6
|/ | | | | Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Doc: replace Mac OS X with OS XNico Vertriest2015-07-151-1/+1
| | | | | | | Task-number: QTBUG-40759 Change-Id: I11b3aa74d35064371cbbbeba660114e086b16aea Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Added a link to the wiki with plugin info.Venugopal Shivashankar2015-05-131-0/+5
| | | | | | | | | | | The wiki summarizes each platform plugin and the supported features. Change-Id: Id7707306880d7e0612e73b879fc48201e0a97417 Task-number: QTBUG-30381 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devSergio Ahumada2015-02-221-1/+1
|\
| * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-131-1/+1
| |\ | | | | | | | | | Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
| | * Fix some typosSergio Ahumada2015-02-111-1/+1
| | | | | | | | | | | | | | | Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Fix BSD license headersSergio Ahumada2015-02-171-3/+3
|/ / | | | | | | | | | | Change-Id: I639ed933b789393fa50630af133e51abe3d7fae3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-1222-136/+136
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | New camera viewfinder settings API.Yoann Lopes2015-01-131-0/+13
|/ | | | | | | | | | | | | | | | There already was a control interface for the viewfinder settings but no real public C++ API and a partial QML API. This patch adds a new C++ API and improves the QML API. Supported viewfinder settings are resolution, minimumFrameRate, maximumFrameRate and pixelFormat. The camera can be queried for the supported values for each of these settings. A new control interface was created to match the new API. Change-Id: I289fea038fe46277a5516c956a64280da09ed985 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Update license headers and add new license filesAntti Kokko2014-08-246-114/+66
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* New camera selection API in QML.Yoann Lopes2014-07-175-5/+81
| | | | | | | | | | | | Also added a new QtMultimedia global object which makes it possible to retrieve the list of available cameras. It can be extended with new utility functions in the future. Includes documentation, example and auto tests. Task-number: QTBUG-23770 Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-102-2/+2
|\ | | | | | | Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
| * Doc: link errorsNico Vertriest2014-07-012-2/+2
| | | | | | | | | | | | Task-number: QTBUG-34749 Change-Id: I1d107a8700e03ac550fd6611d80a985a36558b22 Reviewed-by: Martin Smith <martin.smith@digia.com>