summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/video/qmlvideofx
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-0/+2
|\ | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| * iOS: add NSCameraUsageDescription to Info.plist for qmlvideofxRichard Moe Gustavsen2016-11-021-0/+2
| | | | | | | | | | | | | | | | The 'NSCameraUsageDescription' key is needed for the app to have access to the camera. Change-Id: I8b98247993edd450772e5393551e4acb07dcf0a0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-0/+4
|\| | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| * fix example installsOswald Buddenhagen2016-04-281-0/+4
| | | | | | | | | | Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-081-0/+0
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-221-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: Iff326d7e63d6e0106204beb1f42700032cb6b79a Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove AndroidManifest.xml from qmlvideofx example.Christian Strømme2016-04-052-53/+0
| | | | | | | | | | | | | | | | | | | | | | | | The manifest in qmlvideofx example is useless, and with the strict requirement of API level 16 or higher (585287d0@qttools), it means it's not working out of the box anymore. To avoid similar issues in the future, this change just removes the manifest (instead of bumping the min. version). Task-number: QTBUG-52374 Change-Id: I6c672bdbe23935852c87c93e425003b7b6827771 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-1964-1094/+2182
|/ | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I5b1b87239b21e4b57ca6c8648d69ba090d75c8a8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Fix for disallowed property bindings in qml effect filesPaolo Angelelli2015-11-0612-17/+106
| | | | | | | | | | | | According to the documentation of ListModel.get, "The returned object is not guaranteed to remain valid. It should not be used in property bindings." So the property bindings have been removed, and a js function has been introduced to update the properties upon list change. Task-number: QTBUG-49221 Change-Id: Idaed746ca237198b52a3aff0234076331e1512c1 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Update license header in qmlvideofx example.Yoann Lopes2015-05-051-7/+7
| | | | | Change-Id: Icb525176a8f00cc1a7414e68a7452452d1ef3da0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Yoann Lopes2015-05-052-0/+44
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/avfoundation/camera/avfcamerasession.h src/plugins/avfoundation/camera/avfcamerasession.mm Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85
| * Restore ContentCamera.qmlChristian Strømme2015-04-162-0/+44
| | | | | | | | | | | | | | | | | | | | The file was removed in 5c3a5cf8106e1b873924b296c792448c33ee4df1 but left the description, documentation and parts of the functionality unchanged. This change adds the camera functionality back into the example. Change-Id: I3bfdd95f8322796d446c571a4e074ce98e5443dd Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-062-2/+2
| | | | | | | | | | | | Change-Id: I2c0a3ba90c3343b362cd756584979f1b08405d34 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix debug stream operators.Friedemann Kleint2015-04-071-2/+3
| | | | | | | | | | | | | | | | | | | | - Use QDebugStateSaver to restore space setting in stream operators instead of returning dbg.space() which breaks formatting on streams that already have nospace() set. - Fix some single character string constants, streamline code. Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-1263-785/+609
|/ | | | | | | | | 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>
* QMLVideo Example visual updateTomi Korpipää2014-09-262-44/+0
| | | | | | Task-number: QTBUG-36287 Change-Id: I797a995c2ccd6f6fec40fbf50f93e297ae15a9b1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Make the multimedia examples less verboseAlex Blasche2014-09-223-15/+0
| | | | | | | | | Important warnings such as missing services are still printed though. Task-number: QTBUG-31080 Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove QtSystemInfo dependency from Multimedia examplesAlex Blasche2014-09-192-44/+0
| | | | | | | | | | QtSystemInfo is not officially supported in Qt5 and its QML API is currently broken. Inhibition of the screensaver is not essential for the example anyway. Task-number: QTBUG-31080 Change-Id: Ia2e7d8de3e2044e11e1681907e61a7207489ad1b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-015-4/+12
|\ | | | | | | | | | | | | | | | | Conflicts: src/gsttools/qgstreamervideoinputdevicecontrol.cpp src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
| * Improve Magnify and Ripple effects on video shader exampleNiels Weber2014-08-185-4/+12
| | | | | | | | | | | | | | | | | | Re-enable Magnify shader. Use correct coordinates for Magnify and Ripple shader. Task-number: QTBUG-38121 Change-Id: Ie8d962ba841d074c9ebcf3b86f948848ad6a1812 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-2443-808/+464
|/ | | | | | | | | - 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>
* Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-121-0/+1
| | | | | | | | | The module is not released yet; the current documentation is misleading. Change-Id: Ia20ac8e3504942f6f60b94264f3a12497e09da24 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Handle resizing of mainwindow betterNiels Weber2014-04-301-1/+2
| | | | | | | Task-number: QTBUG-38121 Change-Id: I877fd5c626418a91850d43de31e71351c14eef25 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Selecting something now closes menuNiels Weber2014-04-301-28/+48
| | | | | | | | | On a closed menu, the text is now hidden. Task-number: QTBUG-38121 Change-Id: I305fd4f24768115ed21495857cce672d8cbd2135 Reviewed-by: Petref Saraci <petref.saraci@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Add missing background for effect selection list.Niels Weber2014-04-302-17/+22
| | | | | | | | | | Also remove highlight and fix button text color. Make Menu animation faster. Task-number: QTBUG-38121 Change-Id: I7d5868d370a8dc7925cee5e694ae043970c569d9 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Rework qmlvideofx exampleNiels Weber2014-04-1847-1037/+723
| | | | | | Task-number: QTBUG-38121 Change-Id: If06ba6ce2c66b4d735baaeb56e004861c62ea533 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Fix file browser in qmlvideofx example.Friedemann Kleint2013-08-192-13/+10
| | | | | | | | | | | Similar to de9092389f2e43370c2cfcd6759d08cc11da9a68 for qmlvideo. Use QUrl::fromLocalFile() to get Windows drive handling right. Emulate its behavior in QML code. Fix up() to terminate correctly. Task-number: QTBUG-32139 Change-Id: I36bafaa608ff054190dc76694f6254a74f3b513e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix for url bug in the qmlvideo examples.Christian Strømme2013-06-133-5/+5
| | | | | | | | | | | | In the FileBrowser paths where being prepended with file:///, since all the paths already starts with a forward slash, navigating away from the initial directory was therefore not possible. To make the examples work on Android, QT += multimedia was added. Change-Id: Iff96729d476c4292999b022bdd6d5770b6b011e7 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Loop video infinetely on qmlvideofx.sanevala2013-02-191-0/+1
| | | | | Change-Id: I40e444e75f0fd08860920b78b5b5ff190bce9ae9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* User cannot press cancel after folder up.sanevala2013-02-191-24/+25
| | | | | | | | Moved cancel button on top of folder list views. Selected file is not anymore emitted on cancel. Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* User is not able to select file from FileBrowser and play it.sanevala2013-02-192-8/+14
| | | | | | | | When string is converted to Url qrc:// scheme is used. Fix Filebrowser to use file:// scheme instead. Change-Id: I713e704eb52d27d046ace1ff7d65feb98635461d Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1067-67/+67
| | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Polish and fix qmlvideofx examplehjk2012-12-2028-68/+63
| | | | | Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6 Reviewed-by: hjk <qthjk@ovi.com>
* Examples: Remove qmlapplicationviewer template.v5.0.0Kai Koehne2012-12-173-13/+51
| | | | | | | | | Fix shadow-builds for qmlviewer examples by using qrc files instead. Task-number: QTBUG-28614 Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Get rid of useless requestOrientation() calls in the examples.Samuel Rødal2012-12-061-1/+0
| | | | | | | | requestOrientation() has no effect currently, and its intended effect was probably different from what the examples want to achieve. Change-Id: Ie3235346bd366d5f3468c605ec34394eab9417a7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* centralize and fixup example sources install targetsJoerg Bornemann2012-12-0578-0/+5904
This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:22:48 +0000