diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-09 09:48:17 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-13 10:22:15 +0000 |
| commit | 0a62e444e822bebc48076208451c1eaa2e8cac0c (patch) | |
| tree | 136806e711d0685620eb799f64aa483584bd0154 /src/quicktemplates2/qquickmenu.cpp | |
| parent | 92fcd0a3fb2ee0d1ba242607c1aa5a29864d3650 (diff) | |
Remove unnecessary QQuickMenuPrivate::onItemPressed()
QQuickMenu was developed before QQuickControl::focusPolicy was added.
Now that QQuickAbstractButton sets Qt::StrongFocus, which includes
Qt::ClickFocus, by default, it gains active focus automatically and
there is no need to call forceActiveFocus() by hand. This patch does
not include new tests, because QQuickMenuItem's focus behavior is
already tested in tst_menu.
Change-Id: Ia2c9bed34548c3edbb54b8e5dc1207b3c7520b22
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 64f293d8..37d314a8 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -212,7 +212,6 @@ void QQuickMenuPrivate::insertItem(int index, QQuickItem *item) if (menuItem) { Q_Q(QQuickMenu); QQuickMenuItemPrivate::get(menuItem)->setMenu(q); - QObjectPrivate::connect(menuItem, &QQuickMenuItem::pressed, this, &QQuickMenuPrivate::onItemPressed); QObjectPrivate::connect(menuItem, &QQuickMenuItem::triggered, this, &QQuickMenuPrivate::onItemTriggered); QObjectPrivate::connect(menuItem, &QQuickItem::activeFocusChanged, this, &QQuickMenuPrivate::onItemActiveFocusChanged); QObjectPrivate::connect(menuItem, &QQuickControl::hoveredChanged, this, &QQuickMenuPrivate::onItemHovered); @@ -235,7 +234,6 @@ void QQuickMenuPrivate::removeItem(int index, QQuickItem *item) QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem *>(item); if (menuItem) { QQuickMenuItemPrivate::get(menuItem)->setMenu(nullptr); - QObjectPrivate::disconnect(menuItem, &QQuickMenuItem::pressed, this, &QQuickMenuPrivate::onItemPressed); QObjectPrivate::disconnect(menuItem, &QQuickMenuItem::triggered, this, &QQuickMenuPrivate::onItemTriggered); QObjectPrivate::disconnect(menuItem, &QQuickItem::activeFocusChanged, this, &QQuickMenuPrivate::onItemActiveFocusChanged); QObjectPrivate::disconnect(menuItem, &QQuickControl::hoveredChanged, this, &QQuickMenuPrivate::onItemHovered); @@ -355,14 +353,6 @@ bool QQuickMenuPrivate::blockInput(QQuickItem *item, const QPointF &point) const return (cascade && parentMenu && contains(point)) || QQuickPopupPrivate::blockInput(item, point); } -void QQuickMenuPrivate::onItemPressed() -{ - Q_Q(QQuickMenu); - QQuickItem *item = qobject_cast<QQuickItem*>(q->sender()); - if (item) - item->forceActiveFocus(); -} - void QQuickMenuPrivate::onItemHovered() { Q_Q(QQuickMenu); |