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

4 files changed, 9 insertions, 9 deletions

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index a4e16e4..42e1422 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -7,7 +7,7 @@ Rect {
     Palette { id: Palette }
     Script { source: "calculator.js" }
 
-    VerticalLayout {
+    VerticalPositioner {
         x: 2; spacing: 10; margin: 2
 
         Rect {
@@ -56,7 +56,7 @@ Rect {
                 CalcButton { operation: "C"; id: C; width: 76 }
                 CalcButton { operation: "AC"; id: AC; x: 78; width: 76 }
 
-                GridLayout {
+                GridPositioner {
                     id: NumKeypad; y: 32; spacing: 2; columns: 3
 
                     CalcButton { operation: "7" }
@@ -70,7 +70,7 @@ Rect {
                     CalcButton { operation: "3" }
                 }
 
-                HorizontalLayout {
+                HorizontalPositioner {
                     y: 128; spacing: 2
 
                     CalcButton { operation: "0"; width: 50 }
@@ -78,7 +78,7 @@ Rect {
                     CalcButton { operation: "="; id: Equals; x: 77;  width: 102 }
                 }
 
-                VerticalLayout {
+                VerticalPositioner {
                     id: SimpleOperations
                     x: 156; y: 0; spacing: 2
 
@@ -89,7 +89,7 @@ Rect {
                 }
             }
 
-            GridLayout {
+            GridPositioner {
                 id: AdvancedButtons
                 x: 350; spacing: 2; columns: 2; opacity: 0
 
diff --git a/demos/declarative/contacts/Contact.qml b/demos/declarative/contacts/Contact.qml
index 77189e9..c6ed906 100644
--- a/demos/declarative/contacts/Contact.qml
+++ b/demos/declarative/contacts/Contact.qml
@@ -80,7 +80,7 @@ Item {
     function remove() {
         removeContactQuery.exec();
     }
-    VerticalLayout {
+    VerticalPositioner {
         id: layout
         anchors.fill: parent
         spacing: 5
diff --git a/demos/declarative/flickr/content/LikeOMeter.qml b/demos/declarative/flickr/content/LikeOMeter.qml
index 88a28b6..0ba79b1 100644
--- a/demos/declarative/flickr/content/LikeOMeter.qml
+++ b/demos/declarative/flickr/content/LikeOMeter.qml
@@ -5,7 +5,7 @@ Item {
 
     property int rating: 2
 
-    HorizontalLayout {
+    HorizontalPositioner {
         Star {
             rating: 0
             onClicked: { Container.rating = rating }
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 4a55ff5..e175b4e 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -102,8 +102,8 @@ Item {
         anchors.fill: Container
         targets: [(ReturnKey), (Editor)]
     }
-    KeyActions {
+    Item {
         id: ReturnKey
-        keyReturn: "Container.state = ''"
+        Keys.onReturnPressed: "Container.state = ''"
     }
 }