Prevent changing any camera properties while device change is in progress

[harmattan/cameraplus] / qml / CaptureButton.qml

diff --git a/qml/CaptureButton.qml b/qml/CaptureButton.qml
index 9f0dde5..2c6d4fc 100644 (file)
--- a/qml/CaptureButton.qml
+++ b/qml/CaptureButton.qml
@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Item {
     id: button
 
-    property url iconSource
+    property alias iconSource: icon.source
     property CameraButtonStyle platformStyle: CameraButtonStyle {}
 
     property alias pressed: mouse.pressed
@@ -49,7 +49,7 @@ Item {
         border.top: button.platformStyle.backgroundMarginTop
         border.right: button.platformStyle.backgroundMarginRight
         border.bottom: button.platformStyle.backgroundMarginBottom
-        source:  pressed ? button.platformStyle.pressedBackground : button.platformStyle.background
+        source: pressed ? button.platformStyle.pressedBackground : button.platformStyle.background
     }
 
     Image {
@@ -57,7 +57,6 @@ Item {
         anchors.centerIn: parent
         anchors.verticalCenter: parent.verticalCenter
         anchors.verticalCenterOffset: -1
-        source: button.iconSource
         visible: source != ""
     }
 }