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 /src/controls/qtmenu.cpp | |
| parent | 8cc52b9d1e2638f0636f2817dffeccd623063718 (diff) | |
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 'src/controls/qtmenu.cpp')
| -rw-r--r-- | src/controls/qtmenu.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/controls/qtmenu.cpp b/src/controls/qtmenu.cpp index bed3d6ab7..ca1d3e107 100644 --- a/src/controls/qtmenu.cpp +++ b/src/controls/qtmenu.cpp @@ -116,12 +116,6 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty int Menu::selectedIndex - - The index of the last selected item in the menu. -*/ - -/*! \qmlmethod void Menu::popup() Opens this menu under the mouse cursor. @@ -188,7 +182,7 @@ void QtMenu::setSelectedIndex(int index) return; m_selectedIndex = index; - emit selectedIndexChanged(); + emit __selectedIndexChanged(); } void QtMenu::updateSelectedIndex() |