1 files changed, 39 insertions, 42 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
index 3a06cf0..64ab65b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml
@@ -2,40 +2,55 @@ import QtQuick 1.0
 import "../../shared" 1.0
 
 Rectangle {
-    id: s; width: 620; height: 600; color: "lightsteelblue"
+    id: s; width: 620; height: 360; color: "lightsteelblue"
     property string text: "Jackdaws love my big sphinx of quartz."
 
     Column {
         spacing: 8
         TestText {
-            text: s.text
-        }
-        TestText {
-            text: s.text; font.pixelSize: 18
-        }
-        TestText {
-            text: s.text; font.pointSize: 20
-        }
-        TestText {
-            text: s.text; color: "red"; smooth: true
-        }
-        TestText {
-            text: s.text; font.capitalization: "AllUppercase"
-        }
-        TestText {
-            text: s.text; font.underline: true
-        }
-        TestText {
-            text: s.text; font.overline: true; smooth: true
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
         }
         TestText {
-            text: s.text; font.strikeout: true
+            font.pixelSize: 18
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width;
         }
         TestText {
-            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
+            font.pixelSize: 24
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width;
         }
-        TestText {
-            text: s.text; font.letterSpacing: 2
+        Grid{
+            columns: 2
+            spacing: 4
+            TestText {
+                text: s.text; color: "red"; smooth: true
+            }
+            TestText {
+                text: s.text; font.capitalization: "AllUppercase"
+            }
+            TestText {
+                text: s.text; font.underline: true
+            }
+            TestText {
+                text: s.text; font.overline: true; smooth: true
+            }
+            TestText {
+                text: s.text; font.strikeout: true
+            }
+            TestText {
+                text: s.text; font.underline: true; font.overline: true; font.strikeout: true
+            }
+            TestText {
+                text: s.text; style: Text.Outline; styleColor: "white"
+            }
+            TestText {
+                text: s.text; style: Text.Sunken; styleColor: "gray"
+            }
+            TestText {
+                text: s.text; style: Text.Raised; styleColor: "yellow"
+            }
+            TestText {
+                text: s.text; font.letterSpacing: 2
+            }
         }
         TestText {
             text: s.text; font.underline: true; font.letterSpacing: 2; font.capitalization: "AllUppercase"; color: "blue"
@@ -43,24 +58,6 @@ Rectangle {
         TestText {
             text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
         }
-        TestText {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
-        }
-        TestText {
-            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
-        }
-        TestText {
-            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
-        }
-        TestText {
-            text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width
-        }
-        TestText {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20
-        }
-        TestText {
-            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20
-        }
         Row{
             height: childrenRect.height
             spacing: 4