summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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.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.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>
* | 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
| | * Fixed revisions of camera-related meta objects.Marco Benelli2015-09-152-9/+17
| | | | | | | | | | | | | | | Change-Id: I91fe90122d53ce12322cecac8282ef9622869b71 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| | * Fix QML Camera::supportedViewfinderFrameRateRanges().Yoann Lopes2015-08-252-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the resolution argument as a QJSValue instead of a QSize. This allows to be more flexible and doesn't require the QML argument to be an actual QML 'size' value. It can be any object with the 'width' and 'height' properties. Added missing auto-tests for supportedViewfinderResolutions() and supportedViewfinderFrameRateRanges(). Change-Id: I6c8ae72e6dab8c9d12bbada5b8e7f45e96e9289d Task-number: QTBUG-47630 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Fix possible crashes in QDeclarativeRadioData.Yoann Lopes2015-08-251-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | It would crash when accessing any of its properties when there is no radio backend available. Task-number: QTBUG-47859 Change-Id: Ic7c0a70ca3e9a4768359b3429ea812caece09fce Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0614-0/+154
|/ / | | | | | | | | | | Task-number: QTBUG-48595 Change-Id: I1370d9229b0606582cbd828de84ee2717dca3daf Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix QML revisions registration for 5.6.Yoann Lopes2015-09-154-11/+180
| | | | | | | | | | | | | | | | And update plugins.qmltypes file. Change-Id: I9b3cbeda4c8a0ce88a88f5a16fae6834dc8363d7 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Fix MediaPlayer::playlist documentation.Yoann Lopes2015-08-242-0/+6
| | | | | | | | | | | | | | Added missing '\since 5.6' tag. Change-Id: I46e0ea8bad85fb1f51f5502766c13549c6dad9d5 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2412-1316/+166
|\| | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * Doc: Corrected a typo.Venugopal Shivashankar2015-08-112-3/+3
| | | | | | | | | | Change-Id: I53ab7ddf0a8c0416dce19bf2b642e7e294f3c868 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Fix documentation for QML metaData property.Yoann Lopes2015-08-113-1231/+139
| | | | | | | | | | | | | | | | | | For Audio, Video, MediaPlayer and Camera types. Group the sub properties as a \qmlproperty group, which makes the doc much clearer. Change-Id: Id990d7b14a4c3f86768c6b3b4990845f84839944 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix qdoc warnings.Yoann Lopes2015-08-112-9/+1
| | | | | | | | | | Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-1112-57/+0
| | | | | | | | | | | | | | | | | | 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>
| * Improve documentation for mediaObject property.Yoann Lopes2015-08-112-19/+26
| | | | | | | | | | | | | | In Camera and MediaPlayer types. Change-Id: Iaf17dc7e5f7075ce7eeefcf7992b970d1ea99e83 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-104-3/+206
| | | | | | | | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Added new playlist QML type.Loïc Molinari2015-08-107-3/+891
| | | | | | | | | | Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-2/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af
| * Define QCamera::FrameRateRange as a struct.Yoann Lopes2015-06-111-2/+2
| | | | | | | | | | | | | | | | Instead of an alias for QPair<qreal, qreal>. Task-number: QTBUG-46563 Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-031-1/+4
|\| | | | | | | Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886
| * Fix documentation for Camera flash mode enum.Yoann Lopes2015-05-181-1/+4
| | | | | | | | | | | | | | | | Added missing documentation for Camera.FlashVideoLight and corrected it for Camera.FlashTorch. Change-Id: Ib1823b6554bd2f9db92e047fd4755ae7fb3e0f96 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Refactored code for audio engine to allow dynamic object creationSiteshwar Vashisht2015-04-2313-229/+425
|/ | | | | | | | | | | | QDeclarativeSound, QDeclarativeAudioSample, QDeclarativeAudioCategory and QDeclarativeAttenuationModel can now be dynamically added to AudioEngine instance or declared inside AudioEngine object definition. QDeclarativePlayVariation can now be dynamically added to Sound instance or declared inside Sound object definition. Change-Id: If4c2e16895a71eb71ded1998c107360698f8ac7f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Update plugins.qmltypesYoann Lopes2015-04-151-5/+74
| | | | | | Change-Id: Iaa05756066c8040fe110707eee6b7d71b2a1aa84 Task-number: QTBUG-44300 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* [QSoundBuffer] Replace isReady() with state() statesKonstantin Ritt2015-04-156-18/+36
| | | | | | | | | The two-state "isReady" is not enough for checking if loading was already requested. This also makes it abvious we're accepting load() after error. Change-Id: I8181f99e8b36be484ec791862941b5b2ec78eb1f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-157-64/+291
|\ | | | | | | | | | | | | | | Conflicts: src/multimedia/playback/playlistfileparser.cpp src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
| * Fix incorrect signal/slot connection in QDeclarativeTorch.Yoann Lopes2015-04-141-1/+1
| | | | | | | | | | Change-Id: Id8cb716e25a2c08111f99112fbf319fb8331d64d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Updated plugins.qmltypes.Yoann Lopes2015-04-091-19/+241
| | | | | | | | | | | | | | Task-number: QTBUG-44300 Change-Id: Id6c8dce17e03c79f29581bd49be184a8d3e7f21b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Make the QtMultimedia singleton type a QObject.Yoann Lopes2015-04-093-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a QJSValue for the sake of being as lightweight as possible and because we don't actually need any of the QObject features for that type in its current state. However, this implies that type information is not available at runtime. This is a problem for qmlplugindump which currently crashes because it always expects every QML type to have an associated meta object. We can safely make that type a QObject since it doesn't affect source compatibility in any way. This type was bound to become a QObject at some point anyway. Task-number: QTBUG-44299 Change-Id: I2d9b874f15ffc94ed95ef74fadc3b1fd193fe1ef Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix type of Camera's errorCode property.Yoann Lopes2015-04-081-1/+1
| | | | | | | | | | | | | | It's supposed to be of type enumeration (Error) and not QString. Change-Id: Ia3ce112efa3e87614c79b89d05313b0faa557289 Reviewed-by: Andrew Knight <qt@panimo.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 08:46:40 +0000