diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-03-07 14:33:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-07 18:33:13 +0100 |
| commit | f37d8d063408e6f89e48201bb8878c3a820a2f1f (patch) | |
| tree | 27b36578ed45a3dc2e31fe04e2d36057c90165d3 /tests/manual | |
| parent | c58290ee7af6f2abcd08cbf319ff6f85b9db9fdb (diff) | |
| download | qtquickcontrols-f37d8d063408e6f89e48201bb8878c3a820a2f1f.tar.gz | |
Fix scrollview manual test
Found some interesting regressions but will fix those in separate
commits.
Change-Id: Ibe14e2a94e683b660abd547c24ea895978bd7fa6
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/scrollview/main.qml (renamed from tests/manual/scrollbars.qml) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/manual/scrollbars.qml b/tests/manual/scrollview/main.qml index bcfa8975..8c077af8 100644 --- a/tests/manual/scrollbars.qml +++ b/tests/manual/scrollview/main.qml @@ -86,13 +86,13 @@ ApplicationWindow { id:frame anchors.fill: parent anchors.margins: 4 - frame: false + frameVisible: frameCheck.checked Tab { title: "Rectangle" ScrollView { anchors.fill: parent anchors.margins:4 - frame: frameCheck.checked + frameVisible: frameCheck.checked Rectangle { width: widthSpinBox.value height: heightSpinBox.value @@ -104,12 +104,12 @@ ApplicationWindow { ScrollView { anchors.fill: parent anchors.margins:4 - frame: frameCheck.checked + frameVisible: frameCheck.checked Image { width: widthSpinBox.value height: heightSpinBox.value fillMode: Image.Tile - source: "../../examples/touch/images/button_pressed.png" + source: "../../../examples/touch/images/button_pressed.png" } } } @@ -118,7 +118,7 @@ ApplicationWindow { ScrollView{ anchors.fill: parent anchors.margins:4 - frame: true + frameVisible: frameCheck.checked Flickable { contentWidth: widthSpinBox.value contentHeight: heightSpinBox.value @@ -126,7 +126,7 @@ ApplicationWindow { width: widthSpinBox.value height: heightSpinBox.value fillMode: Image.Tile - source: "../../examples/touch/images/button_pressed.png" + source: "../../../examples/touch/images/button_pressed.png" } } } @@ -136,7 +136,7 @@ ApplicationWindow { TextArea { id: area anchors.margins:4 - frame: frameCheck.checked + frameVisible: frameCheck.checked text: loremIpsum + loremIpsum + loremIpsum + loremIpsum anchors.fill: parent } @@ -146,7 +146,7 @@ ApplicationWindow { ScrollView{ anchors.fill: parent anchors.margins:4 - frame: true + frameVisible: frameCheck.checked ListView { width: 400 model: 30 @@ -175,7 +175,7 @@ ApplicationWindow { anchors.margins:4 anchors.fill: parent model: 10 - frame: frameCheck.checked + frameVisible: frameCheck.checked TableViewColumn {title: "first" width: view.viewport.width |