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>
This commit is contained in:
committed by
Qt by Nokia
parent
9b162f9844
commit
8484b0ff9c
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user