projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Campass and Orientation to CameraCompass and CameraOrientation
[harmattan/cameraplus]
/
qml
/
PipelineManager.qml
diff --git
a/qml/PipelineManager.qml
b/qml/PipelineManager.qml
index
d328711
..
0ef0a68
100644
(file)
--- a/
qml/PipelineManager.qml
+++ b/
qml/PipelineManager.qml
@@
-20,7
+20,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick
1.1
+import QtQuick
2.0
import QtCamera 1.0
import CameraPlus 1.0
import QtCamera 1.0
import CameraPlus 1.0
@@
-60,7
+60,7
@@
Item {
function startCamera() {
if (error) {
return
function startCamera() {
if (error) {
return
- } else if ((currentPolicyMode == currentItem.policyMode) && cam.running) {
+ } else if ((currentPolicyMode == currentItem.policyMode) && cam
era
.running) {
return
} else if (!policy.acquire(currentItem.policyMode)) {
console.log("Failed to acquire policy resources")
return
} else if (!policy.acquire(currentItem.policyMode)) {
console.log("Failed to acquire policy resources")