Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / ImageSettings.qml

diff --git a/qml/ImageSettings.qml b/qml/ImageSettings.qml
index 220f226..dfb039e 100644 (file)
--- a/qml/ImageSettings.qml
+++ b/qml/ImageSettings.qml
@@ -20,11 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 
 Flickable {
+    property Camera camera: null
+
+    id: flick
+
     contentHeight: col.height
     anchors.fill: parent
     anchors.margins: 10
@@ -34,12 +37,13 @@ Flickable {
         width: parent.width
         spacing: 10
 
-        Label {
+        CameraLabel {
             font.pixelSize: 36
             text: qsTr("Image settings")
         }
 
         ImageResolutionSettings {
+            camera: flick.camera
             width: parent.width
         }