Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
index 42cec3a..025aa80 100644
--- a/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
@@ -10,14 +10,14 @@ then a final full transition.
 */
 
 Rectangle {
-    width: 800;
-    height: 480;
+    width: 400;
+    height: 240;
     color: "black";
 
     Rectangle {
         id: gr
         color: "green"
-        width: 100; height: 100
+        width: 50; height: 50
     }
 
     MouseArea {
@@ -27,21 +27,21 @@ Rectangle {
 
     Rectangle {
         id: np
-        x: 300
-        width: 300; height: 300
+        x: 150
+        width: 150; height: 150
         color: "yellow"
         clip: true
         Rectangle {
             color: "red"
-            x: 100; y: 100; height: 100; width: 100
+            x: 50; y: 50; height: 50; width: 50
         }
 
     }
 
     Rectangle {
         id: vp
-        x: 200; y: 200
-        width: 100; height: 100
+        x: 100; y: 100
+        width: 50; height: 50
         color: "blue"
         rotation: 45
         scale: 2
@@ -53,7 +53,7 @@ Rectangle {
         ParentChange {
             target: gr
             parent: np
-            x: 100; y: 100; width: 200;
+            x: 50; y: 50; width: 100;
         }
     }