Merge branch 'qdoc-simplified' into mimir-simplified

Conflicts:
	doc/src/platforms/compiler-notes.qdoc
	tools/qdoc3/ditaxmlgenerator.cpp
	tools/qdoc3/ditaxmlgenerator.h
	tools/qdoc3/htmlgenerator.cpp
	tools/qdoc3/htmlgenerator.h
	tools/qdoc3/node.cpp
	tools/qdoc3/pagegenerator.h

1 files changed, 58 insertions, 47 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
index 8c21cee..33d8cb8 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/animated-smooth.qml
@@ -4,52 +4,63 @@ import "content"
 Rectangle {
     id: page
     color: "white"
-    width: 1030; height: 540
-
-    MyBorderImage {
-        x: 20; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240
-        source: "content/colors.png"; margin: 30; antialiased: true
-    }
-    MyBorderImage {
-        x: 270; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240; antialiased: true
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 520; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240; antialiased: true
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 770; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240; antialiased: true
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-    }
-    MyBorderImage {
-        x: 20; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-    }
-    MyBorderImage {
-        x: 270; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 520; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 770; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+    width: 520; height: 260
+    Grid{
+        columns: 4
+        spacing: 4
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 60; maxHeight: 120
+            source: "content/colors.png"; margin: 15
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 60; maxHeight: 120
+            source: "content/colors.png"; margin: 15
+            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 60; maxHeight: 120
+            source: "content/colors.png"; margin: 15
+            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 60; maxHeight: 120
+            source: "content/colors.png"; margin: 15
+            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 40; maxHeight: 120
+            source: "content/bw.png"; margin: 10
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 40; maxHeight: 120
+            source: "content/bw.png"; margin: 10
+            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 40; maxHeight: 120
+            source: "content/bw.png"; margin: 10
+            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+            antialiased: true
+        }
+        MyBorderImage {
+            minWidth: 60; maxWidth: 120
+            minHeight: 40; maxHeight: 120
+            source: "content/bw.png"; margin: 10
+            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+            antialiased: true
+        }
     }
 }