projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VideoPlayer::paused property does not exist. Use VideoPlayer::state instead
[harmattan/cameraplus]
/
qml
/
SettingsView.qml
diff --git
a/qml/SettingsView.qml
b/qml/SettingsView.qml
index
0176027
..
8965fd5
100644
(file)
--- a/
qml/SettingsView.qml
+++ b/
qml/SettingsView.qml
@@
-25,6
+25,7
@@
import QtCamera 1.0
import CameraPlus 1.0
Item {
import CameraPlus 1.0
Item {
+ property Camera camera: null
property int policyMode: settings.mode == Camera.VideoMode ? CameraResources.Video
: CameraResources.Image
property int policyMode: settings.mode == Camera.VideoMode ? CameraResources.Video
: CameraResources.Image
@@
-33,4
+34,11
@@
Item {
anchors.fill: parent
source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoSettings.qml") : Qt.resolvedUrl("ImageSettings.qml")
}
anchors.fill: parent
source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoSettings.qml") : Qt.resolvedUrl("ImageSettings.qml")
}
+
+ Binding {
+ target: loader.item
+ property: "camera"
+ value: camera
+ when: loader.item != null
+ }
}
}