Autotest format conversion.

25 files changed, 364 insertions, 104 deletions

diff --git a/tests/auto/declarative/layouts/data/grid-margin.qml b/tests/auto/declarative/layouts/data/grid-margin.qml
new file mode 100644
index 0000000..bae47f9
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/grid-margin.qml
@@ -0,0 +1,38 @@
+Item {
+    width: 640
+    height: 480
+    GridLayout {
+        columns: 3
+        margin: 8
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rect {
+            id: three
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rect {
+            id: four
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: five
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/grid-margin.xml b/tests/auto/declarative/layouts/data/grid-margin.xml
deleted file mode 100644
index fe58eef..0000000
--- a/tests/auto/declarative/layouts/data/grid-margin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Item width="640" height="480">
-    <GridLayout columns="3" margin="8">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="green" width="20" height="50"/>
-        <Rect id="three" color="blue" width="50" height="20"/>
-        <Rect id="four" color="cyan" width="50" height="50"/>
-        <Rect id="five" color="magenta" width="10" height="10"/>
-    </GridLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/grid-spacing-margin.qml b/tests/auto/declarative/layouts/data/grid-spacing-margin.qml
new file mode 100644
index 0000000..100d8c5
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/grid-spacing-margin.qml
@@ -0,0 +1,39 @@
+Item {
+    width: 640
+    height: 480
+    GridLayout {
+        columns: 3
+        spacing: 4
+        margin: 8
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rect {
+            id: three
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rect {
+            id: four
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: five
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/grid-spacing-margin.xml b/tests/auto/declarative/layouts/data/grid-spacing-margin.xml
deleted file mode 100644
index 807b653..0000000
--- a/tests/auto/declarative/layouts/data/grid-spacing-margin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Item width="640" height="480">
-    <GridLayout columns="3" spacing="4" margin="8">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="green" width="20" height="50"/>
-        <Rect id="three" color="blue" width="50" height="20"/>
-        <Rect id="four" color="cyan" width="50" height="50"/>
-        <Rect id="five" color="magenta" width="10" height="10"/>
-    </GridLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/grid-spacing.qml b/tests/auto/declarative/layouts/data/grid-spacing.qml
new file mode 100644
index 0000000..494127b
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/grid-spacing.qml
@@ -0,0 +1,38 @@
+Item {
+    width: 640
+    height: 480
+    GridLayout {
+        columns: 3
+        spacing: 4
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rect {
+            id: three
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rect {
+            id: four
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: five
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/grid-spacing.xml b/tests/auto/declarative/layouts/data/grid-spacing.xml
deleted file mode 100644
index 55ef5a5..0000000
--- a/tests/auto/declarative/layouts/data/grid-spacing.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Item width="640" height="480">
-    <GridLayout columns="3" spacing="4">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="green" width="20" height="50"/>
-        <Rect id="three" color="blue" width="50" height="20"/>
-        <Rect id="four" color="cyan" width="50" height="50"/>
-        <Rect id="five" color="magenta" width="10" height="10"/>
-    </GridLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/grid.qml b/tests/auto/declarative/layouts/data/grid.qml
new file mode 100644
index 0000000..598915f
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/grid.qml
@@ -0,0 +1,37 @@
+Item {
+    width: 640
+    height: 480
+    GridLayout {
+        columns: 3
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rect {
+            id: three
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rect {
+            id: four
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: five
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/grid.xml b/tests/auto/declarative/layouts/data/grid.xml
deleted file mode 100644
index abef813..0000000
--- a/tests/auto/declarative/layouts/data/grid.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Item width="640" height="480">
-    <GridLayout columns="3">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="green" width="20" height="50"/>
-        <Rect id="three" color="blue" width="50" height="20"/>
-        <Rect id="four" color="cyan" width="50" height="50"/>
-        <Rect id="five" color="magenta" width="10" height="10"/>
-    </GridLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/horizontal-margin.qml b/tests/auto/declarative/layouts/data/horizontal-margin.qml
new file mode 100644
index 0000000..8bf2329
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/horizontal-margin.qml
@@ -0,0 +1,25 @@
+Item {
+    width: 640
+    height: 480
+    HorizontalLayout {
+        margin: 10
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/horizontal-margin.xml b/tests/auto/declarative/layouts/data/horizontal-margin.xml
deleted file mode 100644
index 7ee9706..0000000
--- a/tests/auto/declarative/layouts/data/horizontal-margin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <HorizontalLayout margin="10">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </HorizontalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml b/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml
new file mode 100644
index 0000000..79652f6
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml
@@ -0,0 +1,26 @@
+Item {
+    width: 640
+    height: 480
+    HorizontalLayout {
+        spacing: 5
+        margin: 10
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing-margin.xml b/tests/auto/declarative/layouts/data/horizontal-spacing-margin.xml
deleted file mode 100644
index 8767818..0000000
--- a/tests/auto/declarative/layouts/data/horizontal-spacing-margin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <HorizontalLayout spacing="5" margin="10">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </HorizontalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing.qml b/tests/auto/declarative/layouts/data/horizontal-spacing.qml
new file mode 100644
index 0000000..5130e4a
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/horizontal-spacing.qml
@@ -0,0 +1,25 @@
+Item {
+    width: 640
+    height: 480
+    HorizontalLayout {
+        spacing: 10
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing.xml b/tests/auto/declarative/layouts/data/horizontal-spacing.xml
deleted file mode 100644
index cb58711..0000000
--- a/tests/auto/declarative/layouts/data/horizontal-spacing.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <HorizontalLayout spacing="10">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </HorizontalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/horizontal.qml b/tests/auto/declarative/layouts/data/horizontal.qml
new file mode 100644
index 0000000..7ad6b55
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/horizontal.qml
@@ -0,0 +1,24 @@
+Item {
+    width: 640
+    height: 480
+    HorizontalLayout {
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/horizontal.xml b/tests/auto/declarative/layouts/data/horizontal.xml
deleted file mode 100644
index f9deaf1..0000000
--- a/tests/auto/declarative/layouts/data/horizontal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <HorizontalLayout>
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </HorizontalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/vertical-margin.qml b/tests/auto/declarative/layouts/data/vertical-margin.qml
new file mode 100644
index 0000000..ad34906
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/vertical-margin.qml
@@ -0,0 +1,25 @@
+Item {
+    width: 640
+    height: 480
+    VerticalLayout {
+        margin: 10
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/vertical-margin.xml b/tests/auto/declarative/layouts/data/vertical-margin.xml
deleted file mode 100644
index abd7635..0000000
--- a/tests/auto/declarative/layouts/data/vertical-margin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <VerticalLayout margin="10">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </VerticalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml b/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml
new file mode 100644
index 0000000..5de50b3
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml
@@ -0,0 +1,26 @@
+Item {
+    width: 640
+    height: 480
+    VerticalLayout {
+        spacing: 5
+        margin: 10
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/vertical-spacing-margin.xml b/tests/auto/declarative/layouts/data/vertical-spacing-margin.xml
deleted file mode 100644
index 3d41ca0..0000000
--- a/tests/auto/declarative/layouts/data/vertical-spacing-margin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <VerticalLayout spacing="5" margin="10">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </VerticalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/vertical-spacing.qml b/tests/auto/declarative/layouts/data/vertical-spacing.qml
new file mode 100644
index 0000000..c364e3f
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/vertical-spacing.qml
@@ -0,0 +1,25 @@
+Item {
+    width: 640
+    height: 480
+    VerticalLayout {
+        spacing: 10
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/vertical-spacing.xml b/tests/auto/declarative/layouts/data/vertical-spacing.xml
deleted file mode 100644
index e25f981..0000000
--- a/tests/auto/declarative/layouts/data/vertical-spacing.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <VerticalLayout spacing="10">
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </VerticalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/data/vertical.qml b/tests/auto/declarative/layouts/data/vertical.qml
new file mode 100644
index 0000000..50931cd
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/vertical.qml
@@ -0,0 +1,24 @@
+Item {
+    width: 640
+    height: 480
+    VerticalLayout {
+        Rect {
+            id: one
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rect {
+            id: two
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rect {
+            id: three
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/vertical.xml b/tests/auto/declarative/layouts/data/vertical.xml
deleted file mode 100644
index 198d99f..0000000
--- a/tests/auto/declarative/layouts/data/vertical.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Item width="640" height="480">
-    <VerticalLayout>
-        <Rect id="one" color="red" width="50" height="50"/>
-        <Rect id="two" color="red" width="20" height="10"/>
-        <Rect id="three" color="red" width="40" height="20"/>
-    </VerticalLayout>
-</Item>
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index 3fc4678..732551c 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -36,7 +36,7 @@ tst_QFxLayouts::tst_QFxLayouts()
 
 void tst_QFxLayouts::test_horizontal()
 {
-    QFxView *canvas = createView(SRCDIR "/data/horizontal.xml");
+    QFxView *canvas = createView(SRCDIR "/data/horizontal.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -60,7 +60,7 @@ void tst_QFxLayouts::test_horizontal()
 
 void tst_QFxLayouts::test_horizontal_spacing()
 {
-    QFxView *canvas = createView(SRCDIR "/data/horizontal-spacing.xml");
+    QFxView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -84,7 +84,7 @@ void tst_QFxLayouts::test_horizontal_spacing()
 
 void tst_QFxLayouts::test_horizontal_margin()
 {
-    QFxView *canvas = createView(SRCDIR "/data/horizontal-margin.xml");
+    QFxView *canvas = createView(SRCDIR "/data/horizontal-margin.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -108,7 +108,7 @@ void tst_QFxLayouts::test_horizontal_margin()
 
 void tst_QFxLayouts::test_horizontal_spacing_margin()
 {
-    QFxView *canvas = createView(SRCDIR "/data/horizontal-spacing-margin.xml");
+    QFxView *canvas = createView(SRCDIR "/data/horizontal-spacing-margin.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -132,7 +132,7 @@ void tst_QFxLayouts::test_horizontal_spacing_margin()
 
 void tst_QFxLayouts::test_vertical()
 {
-    QFxView *canvas = createView(SRCDIR "/data/vertical.xml");
+    QFxView *canvas = createView(SRCDIR "/data/vertical.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -156,7 +156,7 @@ void tst_QFxLayouts::test_vertical()
 
 void tst_QFxLayouts::test_vertical_spacing()
 {
-    QFxView *canvas = createView(SRCDIR "/data/vertical-spacing.xml");
+    QFxView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -180,7 +180,7 @@ void tst_QFxLayouts::test_vertical_spacing()
 
 void tst_QFxLayouts::test_vertical_margin()
 {
-    QFxView *canvas = createView(SRCDIR "/data/vertical-margin.xml");
+    QFxView *canvas = createView(SRCDIR "/data/vertical-margin.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -204,7 +204,7 @@ void tst_QFxLayouts::test_vertical_margin()
 
 void tst_QFxLayouts::test_vertical_spacing_margin()
 {
-    QFxView *canvas = createView(SRCDIR "/data/vertical-spacing-margin.xml");
+    QFxView *canvas = createView(SRCDIR "/data/vertical-spacing-margin.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -228,7 +228,7 @@ void tst_QFxLayouts::test_vertical_spacing_margin()
 
 void tst_QFxLayouts::test_grid()
 {
-    QFxView *canvas = createView("data/grid.xml");
+    QFxView *canvas = createView("data/grid.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -258,7 +258,7 @@ void tst_QFxLayouts::test_grid()
 
 void tst_QFxLayouts::test_grid_spacing()
 {
-    QFxView *canvas = createView("data/grid-spacing.xml");
+    QFxView *canvas = createView("data/grid-spacing.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -288,7 +288,7 @@ void tst_QFxLayouts::test_grid_spacing()
 
 void tst_QFxLayouts::test_grid_margin()
 {
-    QFxView *canvas = createView("data/grid-margin.xml");
+    QFxView *canvas = createView("data/grid-margin.qml");
 
     canvas->execute();
     qApp->processEvents();
@@ -319,7 +319,7 @@ void tst_QFxLayouts::test_grid_margin()
 
 void tst_QFxLayouts::test_grid_spacing_margin()
 {
-    QFxView *canvas = createView("data/grid-spacing-margin.xml");
+    QFxView *canvas = createView("data/grid-spacing-margin.qml");
 
     canvas->execute();
     qApp->processEvents();