Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / VideoTorchButton.qml

diff --git a/qml/VideoTorchButton.qml b/qml/VideoTorchButton.qml
index 7958d7d..dda5a2b 100644 (file)
--- a/qml/VideoTorchButton.qml
+++ b/qml/VideoTorchButton.qml
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,20 +20,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 
-ToolIcon {
-        id: button
-        property Camera camera: null
+CameraToolIcon {
+    id: button
+    property Camera camera: null
 
-        iconSource: settings.videoTorchOn ? "image://theme/icon-m-camera-torch-on" : "image://theme/icon-m-camera-torch-off"
-        onClicked: settings.videoTorchOn = !settings.videoTorchOn
+    iconSource: settings.videoTorchOn ? "image://theme/icon-m-camera-torch-on"
+        : "image://theme/icon-m-camera-torch-off"
+    onClicked: settings.videoTorchOn = !settings.videoTorchOn
 
-        Binding {
-                target: camera.videoTorch
-                property: "on"
-                value: settings.videoTorchOn
-        }
+    Binding {
+        target: camera ? camera.videoTorch : null
+        property: "on"
+        value: settings.videoTorchOn
+        when: camera != null
+    }
 }