diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-11 15:43:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-11 16:06:59 +0100 |
| commit | b9d04b6f5c92f0ef4e30e2bf436be503f739a74d (patch) | |
| tree | 89332c44248c4b7e0294985a3365b3b3b9e07c3b /src/controls/Menu.qml | |
| parent | 2eec5737c407cffe0bed8fac5c337b7b337da99e (diff) | |
| download | qtquickcontrols-b9d04b6f5c92f0ef4e30e2bf436be503f739a74d.tar.gz | |
Menu: Rename 'text' property to 'title'
Change-Id: Ib0b1445593ff48df56cd8d4d20122880c2dacca5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/Menu.qml')
| -rw-r--r-- | src/controls/Menu.qml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index cb6264f7..8641a0e1 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -51,7 +51,7 @@ import "Styles/Settings.js" as Settings \code Menu { - text: "Edit" + title: "Edit" MenuItem { text: "Cut" @@ -74,7 +74,7 @@ import "Styles/Settings.js" as Settings MenuSeparator { } Menu { - text: "More Stuff" + title: "More Stuff" MenuItem { text: "Do Nothing" @@ -246,9 +246,10 @@ MenuPrivate { id: menuItemLoader property var menuItem: modelData - property bool isSeparator: menuItem ? !menuItem.hasOwnProperty("text") : false + property bool isSeparator: menuItem ? !menuItem.hasOwnProperty("enabled") : true property bool hasSubmenu: menuItem ? !!menuItem["items"] : false property bool selected: !isSeparator && root.__currentIndex === index + property string text: hasSubmenu ? menuItem.title : !isSeparator ? menuItem.text : "" property int menuItemIndex: index |