diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:32:37 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 12:12:35 +0200 |
commit | a3d87642cdebb32793258b6fe87c590ee5ceb3a5 (patch) | |
tree | 7097f4db25db90cfcf51dd7176bfd6b6b343097e /tests/auto/controls/data/tst_tableview.qml | |
parent | 783da20117857dbc840b9863f2cb4227773b338c (diff) | |
download | qtquickcontrols-a3d87642cdebb32793258b6fe87c590ee5ceb3a5.tar.gz |
Import QtQuick 2.2
Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tst_tableview.qml')
-rw-r--r-- | tests/auto/controls/data/tst_tableview.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 5dd46ae2..73e1c8d2 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 @@ -71,7 +71,7 @@ TestCase { function test_basic_setup() { var test_instanceStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ TableView { \ TableViewColumn { \ @@ -631,7 +631,7 @@ TestCase { } function test_columnWidth() { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var column = newColumn.createObject(testCase, {title: "title 1"}); verify(column.__view === null) @@ -640,7 +640,7 @@ TestCase { tableView.addColumn(column) compare(column.__view, tableView) compare(column.width, tableView.viewport.width) - var tableView2 = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView2 = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); ignoreWarning("TableView::insertColumn(): you cannot add a column to multiple views") tableView2.addColumn(column) // should not work compare(column.__view, tableView) //same as before @@ -662,7 +662,7 @@ TestCase { } function test_addRemoveColumn() { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) tableView.addColumn(newColumn.createObject(testCase, {title: "title 1"})) compare(tableView.columnCount, 1) @@ -740,7 +740,7 @@ TestCase { } function test_moveColumn(data) { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var titles = ["title 1", "title 2", "title 3"] @@ -774,7 +774,7 @@ TestCase { function test_positionViewAtRow() { var test_instanceStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ TableView { \ TableViewColumn { \ |