diff options
Diffstat (limited to 'tests/auto/declarative/layouts/data')
12 files changed, 6 insertions, 197 deletions
diff --git a/tests/auto/declarative/layouts/data/grid-margin.qml b/tests/auto/declarative/layouts/data/grid-margin.qml deleted file mode 100644 index a49dc85..0000000 --- a/tests/auto/declarative/layouts/data/grid-margin.qml +++ /dev/null @@ -1,40 +0,0 @@ -import Qt 4.6 - -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-spacing-margin.qml b/tests/auto/declarative/layouts/data/grid-spacing-margin.qml deleted file mode 100644 index d2fe4f6..0000000 --- a/tests/auto/declarative/layouts/data/grid-spacing-margin.qml +++ /dev/null @@ -1,41 +0,0 @@ -import Qt 4.6 - -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.qml b/tests/auto/declarative/layouts/data/grid-spacing.qml index 704e3f2..f8b5620 100644 --- a/tests/auto/declarative/layouts/data/grid-spacing.qml +++ b/tests/auto/declarative/layouts/data/grid-spacing.qml @@ -3,7 +3,7 @@ import Qt 4.6 Item { width: 640 height: 480 - GridLayout { + GridPositioner { columns: 3 spacing: 4 Rect { diff --git a/tests/auto/declarative/layouts/data/grid.qml b/tests/auto/declarative/layouts/data/grid.qml index 2f60f16..2fbc37c 100644 --- a/tests/auto/declarative/layouts/data/grid.qml +++ b/tests/auto/declarative/layouts/data/grid.qml @@ -3,7 +3,7 @@ import Qt 4.6 Item { width: 640 height: 480 - GridLayout { + GridPositioner { columns: 3 Rect { id: one diff --git a/tests/auto/declarative/layouts/data/horizontal-margin.qml b/tests/auto/declarative/layouts/data/horizontal-margin.qml deleted file mode 100644 index a96db02..0000000 --- a/tests/auto/declarative/layouts/data/horizontal-margin.qml +++ /dev/null @@ -1,27 +0,0 @@ -import Qt 4.6 - -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-spacing-margin.qml b/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml deleted file mode 100644 index 82957be..0000000 --- a/tests/auto/declarative/layouts/data/horizontal-spacing-margin.qml +++ /dev/null @@ -1,28 +0,0 @@ -import Qt 4.6 - -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.qml b/tests/auto/declarative/layouts/data/horizontal-spacing.qml index 8c55ae9..25dad8a 100644 --- a/tests/auto/declarative/layouts/data/horizontal-spacing.qml +++ b/tests/auto/declarative/layouts/data/horizontal-spacing.qml @@ -3,7 +3,7 @@ import Qt 4.6 Item { width: 640 height: 480 - HorizontalLayout { + HorizontalPositioner { spacing: 10 Rect { id: one diff --git a/tests/auto/declarative/layouts/data/horizontal.qml b/tests/auto/declarative/layouts/data/horizontal.qml index 286b90b..4bce504 100644 --- a/tests/auto/declarative/layouts/data/horizontal.qml +++ b/tests/auto/declarative/layouts/data/horizontal.qml @@ -3,7 +3,7 @@ import Qt 4.6 Item { width: 640 height: 480 - HorizontalLayout { + HorizontalPositioner { Rect { id: one color: "red" diff --git a/tests/auto/declarative/layouts/data/vertical-margin.qml b/tests/auto/declarative/layouts/data/vertical-margin.qml deleted file mode 100644 index a7e10ea..0000000 --- a/tests/auto/declarative/layouts/data/vertical-margin.qml +++ /dev/null @@ -1,27 +0,0 @@ -import Qt 4.6 - -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-spacing-margin.qml b/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml deleted file mode 100644 index 828ae61..0000000 --- a/tests/auto/declarative/layouts/data/vertical-spacing-margin.qml +++ /dev/null @@ -1,28 +0,0 @@ -import Qt 4.6 - -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.qml b/tests/auto/declarative/layouts/data/vertical-spacing.qml index 8d3e86f..aa704be 100644 --- a/tests/auto/declarative/layouts/data/vertical-spacing.qml +++ b/tests/auto/declarative/layouts/data/vertical-spacing.qml @@ -3,7 +3,7 @@ import Qt 4.6 Item { width: 640 height: 480 - VerticalLayout { + VerticalPositioner { spacing: 10 Rect { id: one diff --git a/tests/auto/declarative/layouts/data/vertical.qml b/tests/auto/declarative/layouts/data/vertical.qml index 960f10a..0a52126 100644 --- a/tests/auto/declarative/layouts/data/vertical.qml +++ b/tests/auto/declarative/layouts/data/vertical.qml @@ -3,7 +3,7 @@ import Qt 4.6 Item { width: 640 height: 480 - VerticalLayout { + VerticalPositioner { Rect { id: one color: "red" |