Remove harmattan specific bits from Sounds

[harmattan/cameraplus] / qml / CameraToolBar.qml

diff --git a/qml/CameraToolBar.qml b/qml/CameraToolBar.qml
index 7bd030e..f75a789 100644 (file)
--- a/qml/CameraToolBar.qml
+++ b/qml/CameraToolBar.qml
@@ -20,8 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+@IMPORT_QT_QUICK@
 import "CameraToolBar.js" as Layout
 
 Rectangle {
@@ -31,6 +30,7 @@ Rectangle {
     property int targetWidth: parent.width - (2 * anchors.leftMargin)
     property alias menuWidth: menu.width
     property bool manualBack: false
+    property bool hideBack: false
     signal clicked
 
     height: menu.height
@@ -43,8 +43,9 @@ Rectangle {
         PropertyAnimation { duration: 100 }
     }
 
-    ToolIcon {
+    CameraToolIcon {
         property bool __isMenu: true
+        visible: !parent.hideBack
         id: menu
         anchors.verticalCenter: parent.verticalCenter
         iconSource: "image://theme/icon-m-toolbar-back-white"