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

28 files changed, 56 insertions, 0 deletions

diff --git a/tests/auto/declarative/visual/ListView/basic1/basic1.qml b/tests/auto/declarative/visual/ListView/basic1/basic1.qml
index d9cd030..b1309ca 100644
--- a/tests/auto/declarative/visual/ListView/basic1/basic1.qml
+++ b/tests/auto/declarative/visual/ListView/basic1/basic1.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 200
diff --git a/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/ListView/basic1/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/ListView/basic2/basic2.qml b/tests/auto/declarative/visual/ListView/basic2/basic2.qml
index e5996cf..fa20332 100644
--- a/tests/auto/declarative/visual/ListView/basic2/basic2.qml
+++ b/tests/auto/declarative/visual/ListView/basic2/basic2.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 200
diff --git a/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/ListView/basic2/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/ListView/basic3/basic3.qml b/tests/auto/declarative/visual/ListView/basic3/basic3.qml
index 98aa5fb..aee252f 100644
--- a/tests/auto/declarative/visual/ListView/basic3/basic3.qml
+++ b/tests/auto/declarative/visual/ListView/basic3/basic3.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 200
diff --git a/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/ListView/basic3/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/ListView/basic4/basic4.qml b/tests/auto/declarative/visual/ListView/basic4/basic4.qml
index 9e5229a..76c5723 100644
--- a/tests/auto/declarative/visual/ListView/basic4/basic4.qml
+++ b/tests/auto/declarative/visual/ListView/basic4/basic4.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 200
diff --git a/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml b/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/ListView/basic4/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
index 69c5d81..2086648 100644
--- a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
+++ b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 320
diff --git a/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml b/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml
index 1454949..cd096d7 100644
--- a/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/bindinganimation/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
index cb631d4..d0c988c 100644
--- a/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
+++ b/tests/auto/declarative/visual/colorAnimation/colorAnimation.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: mainrect
     width: 200; height: 200
diff --git a/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml
index 0eb8b12..0926b2c 100644
--- a/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/colorAnimation/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/easing/easing.qml b/tests/auto/declarative/visual/easing/easing.qml
index 7a58276..7bd6c8f 100644
--- a/tests/auto/declarative/visual/easing/easing.qml
+++ b/tests/auto/declarative/visual/easing/easing.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: item
     width: 600
diff --git a/tests/auto/declarative/visual/flickable/Day.qml b/tests/auto/declarative/visual/flickable/Day.qml
index 6af7b1c..549a9a0 100644
--- a/tests/auto/declarative/visual/flickable/Day.qml
+++ b/tests/auto/declarative/visual/flickable/Day.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     property string day
 
diff --git a/tests/auto/declarative/visual/flickable/flickable.qml b/tests/auto/declarative/visual/flickable/flickable.qml
index c466dfc..24931de 100644
--- a/tests/auto/declarative/visual/flickable/flickable.qml
+++ b/tests/auto/declarative/visual/flickable/flickable.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "lightSteelBlue"
     width: 600
diff --git a/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml b/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml
index de3f32e..40b300d 100644
--- a/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/pauseAnimation/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
index e0880f0..2abe83f 100644
--- a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     id: rect
     width: 120
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/qfxtext/elide/elide.qml b/tests/auto/declarative/visual/qfxtext/elide/elide.qml
index 23e6885..0372a9c 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/elide.qml
+++ b/tests/auto/declarative/visual/qfxtext/elide/elide.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     width: contents.width
     height: contents.height
diff --git a/tests/auto/declarative/visual/repeater/basic1/basic1.qml b/tests/auto/declarative/visual/repeater/basic1/basic1.qml
index ba8f44d..c803de9 100644
--- a/tests/auto/declarative/visual/repeater/basic1/basic1.qml
+++ b/tests/auto/declarative/visual/repeater/basic1/basic1.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 300
diff --git a/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/repeater/basic1/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/repeater/basic2/basic2.qml b/tests/auto/declarative/visual/repeater/basic2/basic2.qml
index d975ea4..bcad407 100644
--- a/tests/auto/declarative/visual/repeater/basic2/basic2.qml
+++ b/tests/auto/declarative/visual/repeater/basic2/basic2.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 300
diff --git a/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/repeater/basic2/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/repeater/basic3/basic3.qml b/tests/auto/declarative/visual/repeater/basic3/basic3.qml
index cecba33..223e5e8 100644
--- a/tests/auto/declarative/visual/repeater/basic3/basic3.qml
+++ b/tests/auto/declarative/visual/repeater/basic3/basic3.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 300
diff --git a/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml
index 47d36c3..8fd963b 100644
--- a/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/repeater/basic3/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/repeater/basic4/basic4.qml b/tests/auto/declarative/visual/repeater/basic4/basic4.qml
index 050a2c5..fd78ba2 100644
--- a/tests/auto/declarative/visual/repeater/basic4/basic4.qml
+++ b/tests/auto/declarative/visual/repeater/basic4/basic4.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 Rect {
     color: "blue"
     width: 300
diff --git a/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml b/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/repeater/basic4/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0
diff --git a/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml b/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml
index 6d900f5..7c21d0f 100644
--- a/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml
+++ b/tests/auto/declarative/visual/webview/autosize/data/raster/manifest.qml
@@ -1,3 +1,5 @@
+import Qt 4.6
+
 TestLog {
     TestFullFrame {
         time: 0