diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:37:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 15:17:02 +0200 |
commit | 953b8d7ed82f2701ba8f6f572e60468da544c5ec (patch) | |
tree | a5f2d6b69c9f3ea65c427120f4f2c07d2d3db6e7 /tests/auto/controls/data/tst_tableview.qml | |
parent | 9b206d4b0836f0f89aa667b44c6ac0a963808366 (diff) | |
download | qtquickcontrols-953b8d7ed82f2701ba8f6f572e60468da544c5ec.tar.gz |
Bump QtQuick.Controls import version to 1.2
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
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 73e1c8d2..a9f07a8b 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 Rectangle { @@ -72,7 +72,7 @@ TestCase { function test_basic_setup() { var test_instanceStr = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ TableView { \ TableViewColumn { \ } \ @@ -631,7 +631,7 @@ TestCase { } function test_columnWidth() { - var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView2 = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var titles = ["title 1", "title 2", "title 3"] @@ -775,7 +775,7 @@ TestCase { function test_positionViewAtRow() { var test_instanceStr = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ TableView { \ TableViewColumn { \ } \ |