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

5 files changed, 7 insertions, 16 deletions

diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml
index bb7109e..e6a50cd 100644
--- a/examples/declarative/behaviours/test.qml
+++ b/examples/declarative/behaviours/test.qml
@@ -54,7 +54,7 @@ Rect {
         width: 100
         height: 100
         id: bluerect
-        x: Behaviour {
+        x: Behavior {
             SequentialAnimation {
                 NumericAnimation {
                     target: bluerect
@@ -73,13 +73,9 @@ Rect {
                     duration: 250
                 }
             }
-            NumericAnimation {
-                target: bluerect
-                property: "x"
-                duration: 500
-            }
+            NumericAnimation { duration: 500 }
         }
-        parent: Behaviour {
+        parent: Behavior {
             SequentialAnimation {
                 NumericAnimation {
                     target: bluerect
@@ -87,10 +83,7 @@ Rect {
                     to: 0
                     duration: 150
                 }
-                SetPropertyAction {
-                    target: bluerect
-                    property: "parent"
-                }
+                SetPropertyAction {}
                 NumericAnimation {
                     target: bluerect
                     properties: "opacity"
diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml
index 3877adf..b14dfbf 100644
--- a/examples/declarative/xmldata/daringfireball.qml
+++ b/examples/declarative/xmldata/daringfireball.qml
@@ -19,7 +19,6 @@ Rect {
             Role {
                 name: "content"
                 query: "content/string()"
-                isCData: true
             }
         },
         Component {
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index 206c85f..b465ef1 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -21,7 +21,6 @@ Rect {
             Role {
                 name: "description"
                 query: "description/string()"
-                isCData: true
             }
         },
         Component {
diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp
index 6942fa0..53fe994 100644
--- a/examples/graphicsview/elasticnodes/node.cpp
+++ b/examples/graphicsview/elasticnodes/node.cpp
@@ -52,6 +52,7 @@ Node::Node(GraphWidget *graphWidget)
     : graph(graphWidget)
 {
     setFlag(ItemIsMovable);
+    setFlag(ItemSendsGeometryChanges);
     setCacheMode(DeviceCoordinateCache);
     setZValue(1);
 }
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
index d360de9..2368608 100644
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
+++ b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
@@ -42,13 +42,12 @@
 #include "random_ai_plugin.h"
 
 #include <QState>
+#include <QTime>
 #include <QtPlugin>
 
-#include <time.h>
-
 QState *RandomAiPlugin::create(QState *parentState, QObject *tank)
 {
-    qsrand(uint(time(NULL)));
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
     QState *topLevel = new QState(parentState);