diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-03-06 14:48:21 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-03-07 06:16:44 +0000 |
| commit | 923e7c26fde2bc42d04902441691b7f7667460a7 (patch) | |
| tree | 3f044b1fe7f09ab777585e7660e31e1173c0e468 | |
| parent | c6bf75d7da46d35613db7f2e90ee4e4248d4501d (diff) | |
QQuickPlatformMenu: fix submenu titles not being visible
As with other properties in QQuickPlatformMenu, ensure that we set the
relevant property on the internal QQuickPlatformMenuItem.
Task-number: QTBUG-66876
Change-Id: Ie37d874426200014ea3bb4045bc6b566422221de
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/imports/platform/qquickplatformmenu.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/platform/data/tst_menu.qml | 19 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp index 6168938c..abbea4e7 100644 --- a/src/imports/platform/qquickplatformmenu.cpp +++ b/src/imports/platform/qquickplatformmenu.cpp @@ -522,6 +522,9 @@ void QQuickPlatformMenu::setTitle(const QString &title) if (m_title == title) return; + if (m_menuItem) + m_menuItem->setText(title); + m_title = title; sync(); emit titleChanged(); diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml index 2b7a10ad..06b9a30f 100644 --- a/tests/auto/platform/data/tst_menu.qml +++ b/tests/auto/platform/data/tst_menu.qml @@ -242,4 +242,23 @@ TestCase { compare(Menu.DefaultMenu, 0) compare(Menu.EditMenu, 1) } + + function test_subMenus() { + var parentMenu = createTemporaryObject(menu, testCase) + verify(parentMenu) + + var subMenu = menu.createObject(parentMenu) + verify(subMenu) + + var subMenuItem = subMenu.menuItem + verify(subMenuItem) + + parentMenu.addMenu(subMenu) + compare(parentMenu.items.length, 1) + verify(parentMenu.items[0], subMenuItem) + + subMenu.title = "Title" + compare(subMenu.title, "Title") + compare(subMenuItem.text, "Title") + } } |