summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera
Commit message (Collapse)AuthorAgeFilesLines
* Fix outdated BSD license headerKai Koehne2017-10-187-21/+91
| | | | | Change-Id: I386d30a54819bae016cb50cf5892a5ac380288f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix outdated FDL license headerKai Koehne2017-10-181-3/+3
| | | | | Change-Id: I9cd7043058352ba2aeded74f86d863fca29bd37d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Camera example: Brush up to C++11Friedemann Kleint2017-06-268-53/+55
| | | | | | | | | Use Qt 5 signal/slot syntax, range based for, member initialization. Add message for captured images and fix some minor issues. Task-number: QTBUG-60627 Change-Id: I1011fc95d928a9d2edaad16120acb0dc41f987d9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add shutter icon to camera exampleFriedemann Kleint2017-06-264-2/+36
| | | | | | Task-number: QTBUG-60627 Change-Id: Ib7268d2b939614e713ea6ac209f1c162002d6142 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* iOS: Add Info.plist files to indicate camera and microphone usageAndy Shaw2017-04-281-0/+1
| | | | | | | | | | Since iOS 10 the Info.plist file needs to indicate that it requires the usage of the camera and microphone in any application that requests them. So this adds Info.plist files to be used by the examples in that capacity. Change-Id: I16c6607366f57f4e950e53e1de1fbc0ac224df10 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Examples: Add missing overrideAlexander Volkov2016-12-123-5/+5
| | | | | | Change-Id: I54529fdc8013497edb98ee97863fe4a141bdbf1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Doc: Fix documentation warningsTopi Reinio2016-01-081-1/+1
| | | | | | | | | | - 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>
* Fix BSD license headersSergio Ahumada2015-02-177-21/+21
| | | | | | Change-Id: I639ed933b789393fa50630af133e51abe3d7fae3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-128-41/+41
| | | | | | | | | 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>
* Use QCameraInfo in camera example.Yoann Lopes2014-09-262-16/+13
| | | | | | | To replace QCamera::availableDevices(), which is deprecated since 5.3. Change-Id: I0b1bd6286ec78d6d26ce309d224369989d4a5063 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-141-4/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
| * Doc: Improved example documentationJerome Pasion2014-04-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -added instructions on how to run the example (using \include to insert a section from qtbase/doc/global/) -updated copyright year -removed links to Qt 4 API -rearranged some of the sections -created links from the example pages to Qt Multimedia -fixed QDoc warnings related to the example pages Task-number: QTBUG-33597 Change-Id: Id45ce5cbd40dbfa384abd7260a316f6f6837c186 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | Remove some Q_WS_MAEMO_6 instances from examples.Robin Burchell2014-05-121-8/+0
|/ | | | | | | | | Some of this stuff no longer worked (setGraphicsSystem..) and generally speaking it just doesn't make much sense: widgets on Harmattan were never really a supported platform. Change-Id: Ia853c6b3297075f32e51d68a05121f700509632d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-031-2/+2
| | | | | Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* whitespace fixesOswald Buddenhagen2014-01-301-2/+2
| | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-141-0/+1
| | | | | | | | qmultimedia.h is included in more places, but qmediametadata.h is larger. This patch should reduce unnecessary #include-ing. Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Fix example paths referred in documentationTopi Reinio2013-04-301-1/+1
| | | | | | | | | | | qdocconf files for both Qt Multimedia and Qt Multimedia Widgets already define the correct example path. This change fixes also the example documentation to use the correct path, as well as the link to examples in Multimedia Overview. Change-Id: I72d75027ee18f6398eb76dc40bcc3d122541b1c9 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* add error handling in image capturing in cameraJing Bai2013-02-193-1/+15
| | | | | | Task-number: QTBUG-28589 Change-Id: Ib3a04038c16beba66f8b8cff85b310dad9a4460a Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Doc: Fix module name formatSze Howe Koh2013-01-291-1/+1
| | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-108-8/+8
| | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Updated the \example and \snippet pathsv5.0.0-rc2Venugopal Shivashankar2012-12-121-4/+2
| | | | | | | | | | Also: - Grouped the example docs under one group. i.e. multimedia-examples - Moved the \group page here from the qtdoc repo - Moved the snippets directory under doc from doc/src Change-Id: I28fb81cf910e58101cd601fb4c440b59b0b0366d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* centralize and fixup example sources install targetsJoerg Bornemann2012-12-0513-0/+2020
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-04-25 16:09:05 +0000