diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-07-04 09:49:57 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-07-04 09:50:13 +0300 |
| commit | 13d16d204eb5d9e92a6099c0b90e2730f043c04f (patch) | |
| tree | bee88085e3f53993509af326959dffeb64fded35 /basicsuite/camera/description.txt | |
| parent | c7edfa22fadbb5041b8dee1d5cd27adfcfb7f833 (diff) | |
| parent | 3473ec2b9a38a703310b773e51ce059a8423e379 (diff) | |
Merge commit '3473ec2b9a38a703310b773e51ce059a8423e379' into releaseQtEE_v3.1.0
* commit '3473ec2b9a38a703310b773e51ce059a8423e379': (32 commits)
[Doc] Use symbolic links for demo preview images
Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
Fix demo descriptions.
launchersettings: make ip field span two columns
Remove deleted demos also from doc
Update all VirtualKeyboard import to version 1.1
Doc: Bump version to 3.1.0
Doc: Content/language improvement for About QtEE demo.
Disable GraphicalEffects demo on beagleboneblack
about: fit text properly to the box
Fix Meet Qt Enterprise Embedded video url on startup
Fix a typo in the new About presentation
About Boot to Qt-demo update
Update Enterprise gallery demo description
Remove incorrect assingment of QUrl to bool
Add Meet Qt Enterprise Embedded video to mediaplayer demo
disable camera and sensor demo from Toradex Apalis iMX6
webengine: enable the browser example on android-nexus7v2
Delete obsoleted demos from Boot2Qt launcher
webengine: Add offline Morphing Cubes demo
...
Change-Id: Ic39278a1bc92386b9b9fe15e9d90097a67656a37
Diffstat (limited to 'basicsuite/camera/description.txt')
| -rw-r--r-- | basicsuite/camera/description.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/basicsuite/camera/description.txt b/basicsuite/camera/description.txt index 71c3c44..adfdafa 100644 --- a/basicsuite/camera/description.txt +++ b/basicsuite/camera/description.txt @@ -1,5 +1,3 @@ This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick. -Demo can be used to take pictures. Files are saved inside the /data/images/ folder and can be viewed with the "Photo Gallery" application. - -Camera parameters such as flash mode, scene mode or white balance can be changed. The availability of parameters depends on what the camera driver provides. +Demo can be used to take photos which are saved in the /data/images/ directory. Camera parameters such as flash mode, scene mode or white balance can be changed. The availability of parameters depends on what the camera driver provides. |