Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / FlashButton.qml

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index 2f5497b..ba62c21 100644 (file)
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -20,18 +20,17 @@
  * 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
 import "data.js" as Data
 
-ToolIcon {
+CameraToolIcon {
     id: button
 
     iconSource: "image://theme/" + Data.flashIcon(settings.imageFlashMode)
 
     property list<Item> items: [
-        Label {
+        CameraLabel {
             height: parent ? parent.height : 0
             text: qsTr("Flash")
             verticalAlignment: Text.AlignVCenter