summaryrefslogtreecommitdiffstats
path: root/src/controls/qtmenu.cpp
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-03-11 15:43:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-11 16:06:59 +0100
commitb9d04b6f5c92f0ef4e30e2bf436be503f739a74d (patch)
tree89332c44248c4b7e0294985a3365b3b3b9e07c3b /src/controls/qtmenu.cpp
parent2eec5737c407cffe0bed8fac5c337b7b337da99e (diff)
Menu: Rename 'text' property to 'title'
Change-Id: Ib0b1445593ff48df56cd8d4d20122880c2dacca5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/qtmenu.cpp')
-rw-r--r--src/controls/qtmenu.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/qtmenu.cpp b/src/controls/qtmenu.cpp
index 688ecb65a..1dbc64e44 100644
--- a/src/controls/qtmenu.cpp
+++ b/src/controls/qtmenu.cpp
@@ -82,9 +82,9 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \qmlproperty string Menu::text
+ \qmlproperty string Menu::title
- Text for the menu as a submenu or in a menubar.
+ Title for the menu as a submenu or in a menubar.
Mnemonics are supported by prefixing the shortcut letter with \&.
For instance, \c "\&File" will bind the \c Alt-F shortcut to the
@@ -142,6 +142,8 @@ QtMenu::QtMenu(QObject *parent)
m_menuContentItem(0),
m_popupVisible(false)
{
+ connect(this, SIGNAL(__textChanged()), this, SIGNAL(titleChanged()));
+
m_platformMenu = QGuiApplicationPrivate::platformTheme()->createPlatformMenu();
if (m_platformMenu) {
connect(m_platformMenu, SIGNAL(aboutToHide()), this, SLOT(__closeMenu()));