diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-10 16:22:58 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-11 17:04:59 +0000 |
| commit | 22afbc153628348bc6d4ee0655ea6a6584a13322 (patch) | |
| tree | c30f4250fd301bc2103839612bb48d0003d27d7a /src/gui/kernel/qplatformmenu.h | |
| parent | a4c2e95ce16b3c4f9e0c9c983fb1ce9e70b5ce5a (diff) | |
QShortCut: Check whether the menu is QPA-disabled
When climbing the menu hierarchy, it's sounder to
check whether the actual QPA menu is enabled. This
way we can trigger modifier-less shortcuts even in
submenus.
Task-number: QTBUG-38256
Task-number: QTBUG-42584
Change-Id: I13a27027306bce0f0732b05bf9469f3b77028f73
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qplatformmenu.h')
| -rw-r--r-- | src/gui/kernel/qplatformmenu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h index 0536c3688c..baa1e460d7 100644 --- a/src/gui/kernel/qplatformmenu.h +++ b/src/gui/kernel/qplatformmenu.h @@ -103,6 +103,7 @@ public: virtual void setText(const QString &text) = 0; virtual void setIcon(const QIcon &icon) = 0; virtual void setEnabled(bool enabled) = 0; + virtual bool isEnabled() const { return true; } virtual void setVisible(bool visible) = 0; virtual void setMinimumWidth(int width) { Q_UNUSED(width); } virtual void setFont(const QFont &font) { Q_UNUSED(font); } |