diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-11 18:09:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 15:34:00 +0100 |
| commit | b1a438bf94c6ae0984fc39912b32d5dbf20e3817 (patch) | |
| tree | f63725998ee1a7e4fe08ae6e10997d6355ebe8b1 /tests/auto/controls/data/tst_menu.qml | |
| parent | 8cc52b9d1e2638f0636f2817dffeccd623063718 (diff) | |
| download | qtquickcontrols-b1a438bf94c6ae0984fc39912b32d5dbf20e3817.tar.gz | |
ComboBox: Rename 'selectedIndex' property to 'currentIndex'
Also, removed 'pressed' property. In Menu, we removed 'selectedProperty'
as well. (And by 'removed', we mean 'made it private'.)
Auto-tests have also been updated.
Change-Id: I4b4f9c81aad1165df1d2925964a9cd383079aa9c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tst_menu.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_menu.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index 9884d466..8d039e1d 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -56,7 +56,7 @@ TestCase { SignalSpy { id: menuSpy target: testcase.menu - signalName: "selectedIndexChanged" + signalName: "__selectedIndexChanged" } SignalSpy { @@ -113,7 +113,7 @@ TestCase { compare(menuItemSpy.count, 1) compare(menuSpy.count, 1) - compare(menu.selectedIndex, 2) + compare(menu.__selectedIndex, 2) } function test_check() { @@ -138,7 +138,7 @@ TestCase { compare(menuItemSpy.count, 2) compare(menuSpy.count, 2) - compare(menu.selectedIndex, 3) + compare(menu.__selectedIndex, 3) } ExclusiveGroup { id: eg } @@ -167,19 +167,19 @@ TestCase { compare(menuItemSpy.count, 2) compare(menuSpy.count, 2) - compare(menu.selectedIndex, 3) + compare(menu.__selectedIndex, 3) } - function test_selectedIndex() { + function test___selectedIndex() { for (var i = 0; i < menu.items.length; i++) menu.items[i].checkable = true - menu.selectedIndex = 3 - compare(menu.selectedIndex, 3) - verify(!menu.items[menu.selectedIndex].checked) + menu.__selectedIndex = 3 + compare(menu.__selectedIndex, 3) + verify(!menu.items[menu.__selectedIndex].checked) menu.items[2].trigger() - compare(menu.selectedIndex, 2) - verify(menu.items[menu.selectedIndex].checked) + compare(menu.__selectedIndex, 2) + verify(menu.items[menu.__selectedIndex].checked) } } |