diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_pagestack.qml | 2 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_splitview.qml (renamed from tests/auto/controls/data/tst_splitter.qml) | 18 | ||||
| -rw-r--r-- | tests/manual/SplitterGallery.qml | 106 | ||||
| -rw-r--r-- | tests/manual/splitter.qml | 5 | ||||
| -rw-r--r-- | tests/manual/testbench/main.qml | 2 |
5 files changed, 14 insertions, 119 deletions
diff --git a/tests/auto/controls/data/tst_pagestack.qml b/tests/auto/controls/data/tst_pagestack.qml index 5a7840a6..bad1683b 100644 --- a/tests/auto/controls/data/tst_pagestack.qml +++ b/tests/auto/controls/data/tst_pagestack.qml @@ -60,7 +60,7 @@ TestCase { PageStack {} } - function test_splitterrow() { + function test_pagestack() { var component = stackComponent var stack = component.createObject(testCase); verify (stack !== null, "pagestack created is null") diff --git a/tests/auto/controls/data/tst_splitter.qml b/tests/auto/controls/data/tst_splitview.qml index 9115540a..cf4eb6c2 100644 --- a/tests/auto/controls/data/tst_splitter.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -44,23 +44,23 @@ import QtQuick.Controls 1.0 TestCase { id: testCase - name: "Tests_Splitter" + name: "Tests_SplitView" when: windowShown width: 400 height: 400 Component { - id: splitterRow - Splitter { Item {} Item {} } + id: splitView + SplitView { Item {} Item {} } } - function test_splitter() { - var component = splitterRow - var splitter = component.createObject(testCase); - verify (splitter !== null, "splitterrow created is null") - verify (splitter.orientation === Qt.Horizontal) - verify (splitter.__items.length === 2) + function test_splitView() { + var component = splitView + var view = component.createObject(testCase); + verify (view !== null, "splitview created is null") + verify (view.orientation === Qt.Horizontal) + verify (view.__items.length === 2) } } diff --git a/tests/manual/SplitterGallery.qml b/tests/manual/SplitterGallery.qml deleted file mode 100644 index 8f0e6f65..00000000 --- a/tests/manual/SplitterGallery.qml +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 1.0 - -Rectangle { - width: 800 - height: 500 - color: syspal.window - SystemPalette{id:syspal} - SplitterRow { - id: sr - anchors.fill: parent - Item { - id: r1 - Splitter.minimumWidth: 140 - Splitter.expanding: false - width: 200 - CheckBox { - id: be1 - anchors.centerIn: parent - checked: parent.Splitter.expanding - text: "Set expanding" - onClicked: { - parent.Splitter.expanding = true - be2.checked = !parent.Splitter.expanding - } - } - } - Item { - id: r2 - Splitter.minimumWidth: 140 - Splitter.expanding: true - width: 200 - CheckBox { - id: be2 - anchors.centerIn: parent - text: "Set expanding" - checked: true - onClicked: { - parent.Splitter.expanding = true - be1.checked = !parent.Splitter.expanding - } - } - } - Item { - id: r3 - Splitter.expanding: false - Splitter.minimumWidth: 140 - width: 200 - SplitterColumn { - id: sc - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - Item { - id: cr1 - height:200 - } - Item { - id: cr2 - height: 200 - } - } - } - } -} diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml index 82f0243b..104c92e6 100644 --- a/tests/manual/splitter.qml +++ b/tests/manual/splitter.qml @@ -46,9 +46,10 @@ ApplicationWindow { height: 200 Row { - SplitterColumn { + SplitView { width: 200 height: 200 + orientation: Qt.Vertical Button { text: "Button 1" @@ -61,7 +62,7 @@ ApplicationWindow { } } - SplitterRow { + SplitView { width: 200 height: 200 diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 78248d7f..5f2fea96 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -96,7 +96,7 @@ ApplicationWindow { } } - Splitter { + SplitView { anchors.fill: parent Flickable { id: testBenchRect |