summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-04-10 20:19:34 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-11 03:31:52 +0200
commit8484b0ff9c40fe70cdfc17bf74b0a5be93d674de (patch)
tree2ba877c627c1279fd0e558dc736c8fdec4440906 /src/imports
parent9b162f98440c00dcc0ee4d3b80970a9dc8dc766c (diff)
Fix a number of doc errors and warnings.
* Document a few missing classes/functions/methods * Fix a number of QML snippets that wouldn't work as standalone snippets * Add files to .pro so they show up in Creator.. Still the mysterious lack of controls dir documentation persists :/ Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/qdeclarativecamera.cpp42
-rw-r--r--src/imports/multimedia/qdeclarativecameracapture.cpp40
-rw-r--r--src/imports/multimedia/qdeclarativecamerafocus.cpp24
-rw-r--r--src/imports/multimedia/qdeclarativeradio.cpp51
4 files changed, 92 insertions, 65 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index b540cbaf6..d20f2e9b5 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -93,32 +93,38 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError
import QtQuick 2.0
import QtMultimedia 5.0
- Camera {
- id: camera
+ Item {
+ width: 640
+ height: 360
- imageProcessing.whiteBalanceMode: CameraImageProcessing.WhiteBalanceFlash
+ Camera {
+ id: camera
- exposure {
- exposureCompensation: -1.0
- exposureMode: Camera.ExposurePortrait
- }
+ imageProcessing.whiteBalanceMode: CameraImageProcessing.WhiteBalanceFlash
+
+ exposure {
+ exposureCompensation: -1.0
+ exposureMode: Camera.ExposurePortrait
+ }
- flash.mode: Camera.FlashRedEyeReduction
+ flash.mode: Camera.FlashRedEyeReduction
- imageCapture {
- onImageCaptured: {
- photoPreview.source = preview // Show the preview in an Image element
+ imageCapture {
+ onImageCaptured: {
+ photoPreview.source = preview // Show the preview in an Image element
+ }
}
}
- }
- VideoOutput {
- source: camera
- focus : visible // to receive focus and capture key events when visible
- }
+ VideoOutput {
+ source: camera
+ anchors.fill: parent
+ focus : visible // to receive focus and capture key events when visible
+ }
- Image {
- id: photoPreview
+ Image {
+ id: photoPreview
+ }
}
\endqml
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index 8f7606a19..7cb0c6c9c 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -67,29 +67,35 @@ QT_BEGIN_NAMESPACE
import QtQuick 2.0
import QtMultimedia 5.0
- Camera {
- id: camera
-
- imageCapture {
- onImageCaptured: {
- // Show the preview in an Image element
- photoPreview.source = preview
+ Item {
+ width: 640
+ height: 360
+
+ Camera {
+ id: camera
+
+ imageCapture {
+ onImageCaptured: {
+ // Show the preview in an Image element
+ photoPreview.source = preview
+ }
}
}
- }
- VideoOutput {
- source: camera
- focus : visible // to receive focus and capture key events when visible
+ VideoOutput {
+ source: camera
+ focus : visible // to receive focus and capture key events when visible
+ anchors.fill: parent
- MouseArea {
- anchors.fill: parent;
- onClicked: camera.imageCapture.capture();
+ MouseArea {
+ anchors.fill: parent;
+ onClicked: camera.imageCapture.capture();
+ }
}
- }
- Image {
- id: photoPreview
+ Image {
+ id: photoPreview
+ }
}
\endqml
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index 82084d1a8..d69ed1781 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -64,13 +64,23 @@ QT_BEGIN_NAMESPACE
import QtQuick 2.0
import QtMultimedia 5.0
- Camera {
- id: camera
+ Item {
+ width: 640
+ height: 360
- focus {
- focusMode: Camera.FocusMacro
- focusPointMode: Camera.FocusPointCustom
- customFocusPoint: Qt.point(0.2, 0.2) //focus to top-left corner
+ Camera {
+ id: camera
+
+ focus {
+ focusMode: Camera.FocusMacro
+ focusPointMode: Camera.FocusPointCustom
+ customFocusPoint: Qt.point(0.2, 0.2) //focus to top-left corner
+ }
+ }
+
+ VideoOutput {
+ source: camera
+ anchors.fill: parent
}
}
@@ -232,7 +242,7 @@ void QDeclarativeCameraFocus::setCustomFocusPoint(const QPointF &point)
color: "transparent"
// Map from the relative, normalized frame coordinates
- property mappedRect: viewfinder.mapNormalizedRectToItem(area);
+ property variant mappedRect: viewfinder.mapNormalizedRectToItem(area);
x: mappedRect.x
y: mappedRect.y
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index 1f2a62c3a..cf9e2008b 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -419,34 +419,39 @@ void QDeclarativeRadio::scanUp()
and if the user presses a station, the radio is tuned to this station.
\qml
- Radio {
- id: radio
- onStationFound: radioStations.append({"frequency": frequency, "stationId": stationId})
- }
+ Item {
+ width: 640
+ height: 360
- ListModel {
- id: radioStations
- }
+ Radio {
+ id: radio
+ onStationFound: radioStations.append({"frequency": frequency, "stationId": stationId})
+ }
- ListView {
- model: radioStations
- delegate: Rectangle {
- MouseArea {
- anchors.fill: parent
- onClicked: radio.frequency = frequency
- }
+ ListModel {
+ id: radioStations
+ }
- Text {
- anchors.fill: parent
- text: stationId
+ ListView {
+ model: radioStations
+ delegate: Rectangle {
+ MouseArea {
+ anchors.fill: parent
+ onClicked: radio.frequency = frequency
+ }
+
+ Text {
+ anchors.fill: parent
+ text: stationId
+ }
}
- }
- }
+ }
- Rectangle {
- MouseArea {
- anchors.fill: parent
- onClicked: radio.searchAllStations(Radio.SearchGetStationId)
+ Rectangle {
+ MouseArea {
+ anchors.fill: parent
+ onClicked: radio.searchAllStations(Radio.SearchGetStationId)
+ }
}
}
\endqml