Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

5 files changed, 35 insertions, 5 deletions

diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 37caf24..691bb5b 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -89,6 +89,7 @@ Item {
         id: Editor
         font.bold: true
         color: "white"
+        highlightColor: "green"
         width: 0
         clip: true
         anchors.left: Label.right
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 092aef6..b33b00f 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -119,8 +119,10 @@ Item {
 
     Item {
         id: Background
+    
+        anchors.fill: parent
 
-        Image { source: "content/pics/background.png"; opaque: true }
+        Image { source: "content/pics/background.png"; opaque: true; anchors.fill: parent }
 
         GridView {
             id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate; cacheBuffer: 100
@@ -153,7 +155,7 @@ Item {
                 }
 
                 PathAttribute { name: "scale"; value: 1 }
-                PathAttribute { name: "angle"; value: -45 }
+                PathAttribute { name: "angle"; value: 45 }
             }
 
         }
@@ -203,4 +205,25 @@ Item {
             (FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
         font.size: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
     }
+
+    Image {
+        source: "content/pics/fingerpoint.png"
+        opacity: finger.pressed ? 0 : 1
+        x: finger.mouseX-16
+        y: finger.mouseY-16
+    }
+
+    Image {
+        source: "content/pics/fingerpoint-pressed.png"
+        opacity: finger.pressed ? 1.0 : 0.0
+        x: finger.mouseX-16
+        y: finger.mouseY-16
+    }
+
+    MouseRegion {
+        // this region is just to show where the finger is (good for videos)
+        id: finger
+        absorb: false
+        anchors.fill: parent
+    }
 }
diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml
index 5817f00..1734433 100644
--- a/demos/declarative/webbrowser/content/RectSoftShadow.qml
+++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml
@@ -24,7 +24,7 @@ Item {
         source: "pics/softshadow-bottom.png"
         x: 0
         y: parent.height
-        width: webview.width*webview.scale
+        width: WebView.width*WebView.scale
         height: 16
     }
 }
diff --git a/demos/declarative/webbrowser/content/pics/footer.sci b/demos/declarative/webbrowser/content/pics/footer.sci
new file mode 100644
index 0000000..be1d086
--- /dev/null
+++ b/demos/declarative/webbrowser/content/pics/footer.sci
@@ -0,0 +1,6 @@
+gridLeft: 5
+gridTop: 0
+gridBottom: 0
+gridRight: 5
+imageFile: footer.png
+
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index c754543..4b03b63 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -73,7 +73,7 @@ Item {
 
                     color: "white"
                     styleColor: "black"
-                    style: Raised
+                    style: "Raised"
 
                     font.family: "Helvetica"
                     font.size: 10
@@ -85,7 +85,7 @@ Item {
                     anchors.rightMargin: 4
                     anchors.top: Header.top
                     anchors.topMargin: 4
-                    hAlign: AlignHCenter
+                    hAlign: "AlignHCenter"
                 }
                 Item {
                     width: parent.width