diff options
author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-02-22 11:23:24 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 13:38:25 +0100 |
commit | 59b12b5240f94c4822cdf4f1e4cb05bc0ede76e9 (patch) | |
tree | 4e350c46dcd4dabbb5e74e35498c620c42c84d06 /tests/manual | |
parent | a0714a669030d13f592e20f2a9ef145132bf00e6 (diff) | |
download | qtquickcontrols-59b12b5240f94c4822cdf4f1e4cb05bc0ede76e9.tar.gz |
Rename ScrollArea to ScrollView
We want to introduce View as a common name for items that
are not simple controlss but views controlling other items
Change-Id: I13ffc096742ec13023c58b4744ad53084e11cc67
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/scrollbars.qml | 8 | ||||
-rw-r--r-- | tests/manual/testbench/content/Components.qml | 4 | ||||
-rw-r--r-- | tests/manual/testbench/main.qml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/manual/scrollbars.qml b/tests/manual/scrollbars.qml index 01609906..4ce169da 100644 --- a/tests/manual/scrollbars.qml +++ b/tests/manual/scrollbars.qml @@ -88,7 +88,7 @@ ApplicationWindow { frame: false Tab { title: "Rectangle" - ScrollArea { + ScrollView { anchors.fill: parent anchors.margins:4 frame: frameCheck.checked @@ -100,7 +100,7 @@ ApplicationWindow { } Tab { title: "Image" - ScrollArea { + ScrollView { anchors.fill: parent anchors.margins:4 frame: frameCheck.checked @@ -114,7 +114,7 @@ ApplicationWindow { } Tab { title: "Flickable" - ScrollArea{ + ScrollView{ anchors.fill: parent anchors.margins:4 frame: true @@ -142,7 +142,7 @@ ApplicationWindow { } Tab { title: "ListView" - ScrollArea{ + ScrollView{ anchors.fill: parent anchors.margins:4 frame: true diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml index cb020596..06483882 100644 --- a/tests/manual/testbench/content/Components.qml +++ b/tests/manual/testbench/content/Components.qml @@ -54,7 +54,7 @@ Item { property Component toolbar: ToolBar { } property Component statusbar: StatusBar { } property Component tableview: TableView { model: testDataModel ; TableViewColumn {title: "Column 1"}} - property Component scrollarea: ScrollArea { + property Component scrollview: ScrollView { Rectangle { color: "#eee" width: 1000 @@ -111,7 +111,7 @@ Item { append({ name: "ToolBar", component: toolbar}); append({ name: "StatusBar", component: statusbar}); append({ name: "TableView", component: tableview}); - append({ name: "ScrollArea", component: scrollarea}); + append({ name: "ScrollView", component: scrollview}); } } } diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index c0f64b76..78248d7f 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -367,8 +367,8 @@ ApplicationWindow { id: sidebar color : syspal.window width: 300 - ScrollArea { - id: scrollArea + ScrollView { + id: scrollView anchors.fill: parent flickableItem.flickableDirection: Flickable.VerticalFlick Column { @@ -376,7 +376,7 @@ ApplicationWindow { anchors.left: parent ? parent.left : undefined anchors.top: parent ? parent.top : undefined anchors.margins: 10 - width: scrollArea.viewport.width - 20 + width: scrollView.viewport.width - 20 spacing: 8 Repeater { model: ["Boolean", "String","Int", "Real", "ReadOnly", "Enum"] |