summaryrefslogtreecommitdiffstats
path: root/basicsuite/camera
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Mikko Gronoff2016-12-081-2/+12
|\ | | | | | | | | | | | | * origin/5.6: Fixed demo .pro files: removed exclude.txt and wildcards used with content files Change-Id: I052c0f87dce2b5f8f7fc71647944e620fa6d0055
| * Fixed demo .pro files: removed exclude.txt and wildcards used with content filesKimmo Ollila2016-12-081-2/+12
| | | | | | | | | | Change-Id: Id4731a6438c95ca9abca5e8477bd17228c55cfc7 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * Replace title, description and exclude files with one demos.xmlKimmo Ollila2016-01-273-14/+0
| | | | | | | | | | Change-Id: Ice4d810389ebf186cdfced3964c3a1c7e12e1ead Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | Update license headersTopi Reinio2016-05-0314-97/+224
| | | | | | | | | | | | | | | | | | - Update Copyright year and holder, unify license text formatting - Update BSD, LGPL licenses for files originating from Qt repositories Change-Id: Id77f62f754c3bb29bb4b1c816e3f984a087ee87e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Replace title, description and exclude files with one demos.xmlKimmo Ollila2016-02-193-14/+0
|/ | | | | Change-Id: If6ea447d8613c73bdbe926a567efa3de6f9422fc Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* Replace camera, about-b2qt and multimedia imageKatja Marttila2015-12-181-0/+0
| | | | | | Change-Id: I6b19116441176dc011216c5d39d619ef048ca817 Task-number: QTRD-3769 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Remove some features from the Camera demo to make it work with 5.5Laszlo Agocs2015-06-292-1/+4
| | | | | | | | | | | | We can make the demo work by removing the additional features. The image is now showing up correctly. There is no capture or other controls. This is a temporary solution until QtMultimedia gets fixed in a future release. Task-number: QTEE-960 Change-Id: Ibf00d323ac47cf04bd0efffe53cf4e053809d4eb Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Exluded some demos on colibri-vfAndy Nichols2014-11-241-0/+1
| | | | | | | | Colibri-vf doesn't support opengl based or multimedia applications. Change-Id: If8f0c6077a99f2a5b045b512dfbf343fda526798 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
* Enable camera demo for SABRE and BD imx6 devicesSamuli Piippo2014-11-241-2/+0
| | | | | Change-Id: Idf367086c7bbcd8e258d6733df777d0a0ec05cd2 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Change URLs to qt.ioRainer Keller2014-10-0713-13/+13
| | | | | Change-Id: Ib106911de0365837b97bf4c5c374c97611a276cc Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
* Capture preview images in ~800x600 resolutionRainer Keller2014-09-171-0/+0
| | | | | | Task-number: QTEE-694 Change-Id: Ibcee4da0108a8d087d54495d129b0b871d7b0983 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* Fix demo descriptions.Gatis Paeglis2014-06-301-3/+1
| | | | | | | | | | | | - Camera example refers to the "Photo Gallery" demo, which does not exists anymore. - Shorten the description of the "Qt5 Cinematic Experience" demo, this fixes the overlapping issue. Task-number: QTEE-700 Change-Id: I4552089e2f12d37e9a61c08bb5a2a999dc5cce3a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
* disable camera and sensor demo from Toradex Apalis iMX6Samuli Piippo2014-06-241-0/+1
| | | | | Change-Id: I12d72339a1071500a92b87e7c62fe3d7de6b9b25 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
* Camera demo doesn't work on new nexus just yet, exclude itaavit2014-05-191-0/+1
| | | | | Change-Id: I0f3bf9d7d83e84d4ba3c97747aa8437bbdb004b8 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
* Fix typo in came excludeKalle Viironen2014-05-161-1/+1
| | | | | Change-Id: Ie34dd2368530605cd27c980d814b93ef211ed7e5 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
* Remove non functional demos from i.MX6 SABRE SD launcher demo setKalle Viironen2014-05-141-0/+1
| | | | | Change-Id: I1da24319b52487aba08454b8e1282c342e0f7637 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
* Rearrange the order of demos in the launcherTopi Reinio2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The launcher will sort the demos alphabetically based on their titles, and then removes leading digits (see cf9b6d17). This allows us to control the order of the demos. This change sets the following order, from left to right: About Qt Enterprise Embedded Launcher Settings Qt5 Everywhere Qt5 Cinematic Demo Qt5 Launch Presentation Virtual Keyboard Qt Quick Enterprise Controls - Dashboard Qt Quick Enterprise Controls - Gallery Controls: Touch Qt Charts - Gallery Media Player Camera Photo Gallery Graphical Effects Sensors Demo Change-Id: I80e5fb66b55f5b5541acc70410c555d4d971e220 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
* Fix deployment of QML import plugins when building in Qt CreatorTopi Reinio2014-02-201-2/+3
| | | | | | | | Task-number: QTEE-419 Task-number: QTEE-420 Change-Id: Iaa57cf0b4060f1dfb3fad3e81bc4c4d070cc6820 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
* Update copyright yearaavit2014-02-1214-14/+14
| | | | | Change-Id: I55381dedffc4d86bc25b0c3f6ef18230d70272ee Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Limit camera & mediaplayer demos to working devicesaavit2014-02-121-1/+8
| | | | | Change-Id: I81d3f3a7e142eb0f5f0fef251de7daa9a3f7a7a9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Enable virtual keyboard when building demos stand-aloneTopi Reinio2014-01-301-0/+1
| | | | | | | | | | Add a shared QML file that defines an InputPanel and loads the main QML for each demo. Also, - Do not define QT_IM_MODULE (set already in the system) - Improved exclude file parsing to match b2qt-launcher Change-Id: Ibdd0371a57878ef7bc585aa67fcd148377f54bc6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
* Make basicsuite demos run stand-aloneTopi Reinio2014-01-2723-0/+1857
This change will make the demos run standalone when built in Qt Creator. - Rename example directories to lowercase/non-whitespace to avoid build & deployment problems - Add title.txt files so titles remain displayed correctly in the launcher - Add a common shared source files used for the standalone apps, and .pro-files for each example - Remove .qmlproject files (not needed) - Adjust documentation to match the new directory structure Change-Id: Ib24e461952da3b2c88aab0363249115ea44ee0f2 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 20:09:53 +0000