summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-032-3/+3
| | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-271-7/+19
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimedia/declarative-radio/view.qml src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
| * Update plugins.qmltypes for 5.9Christian Stromme2017-10-201-7/+19
| | | | | | | | | | Change-Id: I3969c6e91438b9e411b8e93a304c666c2c36bf21 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-061-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f9bed6cb611471db61b9c69004f16786822625d
| * Prevent m_runningCount from eventually overflowingAlbert Astals Cid2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When m_loopCount is Infinite (i.e. -1) m_runningCount would go from -2 and down, eventuall wrapping and reaching 0 and thus stopping. This is a theorical problem since even if we had a 1 second video it would take lots of years to trigger but i guess it's better than having the value of m_runningCount be unbounded Change-Id: I340ec2157ece3334e58ab4afd77c34b478a256e9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-06-302-3/+5
|/ | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QtMultimedia: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-131-1/+1
| | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I42426cf89c328db73dc307f9f587654a048047ba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add missing override and remove redundant virtualAlexander Volkov2016-12-1210-37/+37
| | | | | Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-122-5/+3
|\ | | | | | | | | | | | | Conflicts: src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
| * Move qtmultimedia over to the new config systemLars Knoll2016-11-142-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-121-1/+1
|\| | | | | | | Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
| * Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-111-1/+1
| |\ | | | | | | | | | Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
| | * Doc: corrected reference to parameter "end"Nico Vertriest2016-10-041-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia4c521b4eee8efd7afe6efd1f00f3c15fd138d9b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-111-3/+0
|\| | | | | | | | | | | Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-231-3/+0
| |\| | | | | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-221-3/+0
| | |\ | | | | | | | | | | | | Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
| | | * Remove unnecessary import statement in QML snippetYoann Lopes2016-09-201-3/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I1f34e52c4a8f72a91b1c673fe7e152335d8a0ade Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-216-17/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/multimedia/multimedia.cpp Change-Id: I38899391ec8d2fcec6f2d46514286759f7a27629
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-191-7/+7
| |\| | | | | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-7/+7
| | |\| | | | | | | | | | | | | Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
| | | * fix documentation for QML PlaylistJochen Seemann2016-09-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some signals for QDeclarativePlaylist were wrongly tagged to QDeclarativeAudio. Task-number: QTBUG-55007 Change-Id: I16185f74768b45115f19c049ec1261d1d3dadf5c Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | Register 5.8 version for the multimedia QML moduleYoann Lopes2016-09-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There isn't any new API in 5.8, we need to re-register an existing type to make that version number available. Change-Id: I061dc53e9570eefc1cbdcb9d15f557904b5d275f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | Update plugins.qmltypes for 5.8Yoann Lopes2016-09-151-3/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Iade5ceb5f791abaa2ec7649ff4752d1b59d96aad Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | Improve robustness of QML plugin loadingv5.8.0-alpha1Simon Hausmann2016-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: I3bdbee161e4a3b59127dc4f00a0c9ce9386b67c2 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | Improve audio volume documentationYoann Lopes2016-08-222-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added information about volume scales. Change-Id: Ica8367396147e3e1c814b3575faa5cf0503be031 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | Add missing loops property in QML Video typeYoann Lopes2016-09-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The property exists in MediaPlayer but was not aliased in Video. Change-Id: I77a1cede776cd48b01ec91c645fa719eeb474420 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | adding property CameraFlash::supportedModesJochen Seemann2016-09-093-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property contains a list of the supported flash modes and is the QML version of QCameraExposure::isFlashModeSupported(FlashMode). Task-number: QTBUG-45323 Change-Id: I1eb6fcbb126759458c5290e71fa576053b62f05d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | Add notifyInterval for MediaPlayer QML APIJoni Poikelin2016-09-074-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose notifyInterval as a property from QMediaPlayer. Task-number: QTBUG-44961 Change-Id: Ia6c671eb68754e5c9a60032289bd821884824c78 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | adding property CameraCapture::supportedResolutionsJochen Seemann2016-08-313-0/+40
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the new property supportedResolutions to expose the same functionality to QML as QCameraImageCapture::supportedResolutions provides for C++. Exposing as QML property allows us to easily display the resolutions in list-based elements like ListView. Task-number: QTBUG-45289 Change-Id: Ica7206ec1daa36298a761d659d1c0b05d13562ec Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Add LogarithmicVolumeScale to VolumeScale enum.Yoann Lopes2016-06-142-7/+10
| | | | | | | | | | | | | | | Change-Id: I0b556b5f705825fc8c8135305bda4bc860ffbf14 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Add new volume conversion API.Yoann Lopes2016-06-032-0/+62
|/ / | | | | | | | | | | | | | | | | | | | | | | 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-101-5/+5
|\| | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| * Fix property attributes.Christian Stromme2016-04-261-5/+5
| | | | | | | | | | | | | | A property can't be both constant and writable at the same time. Change-Id: Ie1f81fdf10eba7fe84f98f7c34f829cdac654e75 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Update QML revisions for CameraImageProcessingAlex Blasche2016-05-041-1/+1
| | | | | | | | | | | | | | | | | | CameraImageProcessing uses two revisions these days. Updating the qmltypes file was missed when bumping the revision in one of the last commits. Change-Id: Ibb49d26c33ff4eea453839fb0ae87c9f0a9ad5b1 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Do not pin Multimedia QML module versionAlex Blasche2016-05-032-2/+1
| | | | | | | | | | | | | | The module always moves in sync with the Qt release version. Change-Id: Ib8800a450b7e4a76f73f953ec5fffd0dc829a400 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Update qmltypes for Qt MultimediaAlex Blasche2016-04-291-4/+43
| | | | | | | | | | Change-Id: I4093645a5120c4aa15253afd978fe7e13f4fe114 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Mark CameraImageProcessing's new brightness property with revision 2Alex Blasche2016-04-292-3/+5
| | | | | | | | | | | | | | | | It was added in Qt 5.7 and the QML version should be adjusted accordingly. Change-Id: I227a63c240edbe8880612076899dc3db47dc47d0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Add new QDeclarativePlayList 5.7 items with new QML revisionAlex Blasche2016-04-292-4/+7
| | | | | | | | | | Change-Id: I1f332230e34e04a304cbe6d9b6d4a4dceb70095b Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Add missing \since tag for brightness propertyAlex Blasche2016-04-291-0/+2
| | | | | | | | | | | | Change-Id: I804e5ea2bac65e48ddc32c8e60ea36e143b43fc0 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-2110-55/+3
|\| | | | | | | Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
| * Update version number in QML plugins.v5.6.0Yoann Lopes2016-02-2510-55/+3
| | | | | | | | | | | | | | | | | | 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-1959-826/+1180
| | | | | | | | | | | | | | | | | | | | | | 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>
* | imports: replace foreach with range-based forAnton Kudryavtsev2016-01-153-11/+14
| | | | | | | | | | Change-Id: I495438c99337b9423b0a589c1c8d8171d20b0cff Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-01-113-0/+21
| | | | | | | | | | | | Change-Id: Iafdb4359f051fcd20178f3c5f42f2cff2bf8c359 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add moveItem(from, to) to QMediaPlaylist.Jim Hodapp2015-12-182-0/+15
| | | | | | | | | | Change-Id: Ic3c2ab35529ba5056b7f0d172a434e586e6cf03d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Added insertItems and removeItems to QML Playlist.Jim Hodapp2015-12-182-0/+39
| | | | | | | | | | Change-Id: Iba4d08551016c486e88e738e35fb590d82a058a2 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Added addItems to QML Playlist for batch adding of tracks.Jim Hodapp2015-12-182-0/+24
| | | | | | | | | | Change-Id: Ieb7df35ad9dd50bbc68e5305e0de9fb26c64b540 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add camera brightness adjustment API.Denis Shienkov2015-11-232-0/+23
|/ | | | | | | | | | The brightness adjustment already exists in the control API but not in the QCamera and QML Camera APIs. Simply add the missing functions which call into the control API. Change-Id: I56a5aef3ae8bef9ca13c5a01d8282014f6e20830 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-10-065-19/+54
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-025-19/+54
| |\ | | | | | | | | | Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 10:16:37 +0000