diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
| commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
| tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/plugins/platforms/cocoa/qcocoamenuitem.h | |
| parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
| parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenuitem.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.h b/src/plugins/platforms/cocoa/qcocoamenuitem.h index aafc66e06f..23f788687c 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.h +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.h @@ -90,7 +90,9 @@ public: void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE; void setFont(const QFont &font) Q_DECL_OVERRIDE; void setRole(MenuRole role) Q_DECL_OVERRIDE; +#ifndef QT_NO_SHORTCUT void setShortcut(const QKeySequence& shortcut) Q_DECL_OVERRIDE; +#endif void setCheckable(bool checkable) Q_DECL_OVERRIDE { Q_UNUSED(checkable) } void setChecked(bool isChecked) Q_DECL_OVERRIDE; void setEnabled(bool isEnabled) Q_DECL_OVERRIDE; @@ -103,10 +105,10 @@ public: NSMenuItem *sync(); void syncMerged(); - void syncModalState(bool modal); + void setParentEnabled(bool enabled); inline bool isMerged() const { return m_merged; } - inline bool isEnabled() const { return m_enabled; } + inline bool isEnabled() const { return m_enabled && m_parentEnabled; } inline bool isSeparator() const { return m_isSeparator; } QCocoaMenu *menu() const { return m_menu; } @@ -119,20 +121,23 @@ private: NSMenuItem *m_native; NSView *m_itemView; QString m_text; - bool m_textSynced; QIcon m_icon; QPointer<QCocoaMenu> m_menu; - bool m_isVisible; - bool m_enabled; - bool m_isSeparator; QFont m_font; MenuRole m_role; MenuRole m_detectedRole; +#ifndef QT_NO_SHORTCUT QKeySequence m_shortcut; - bool m_checked; - bool m_merged; +#endif quintptr m_tag; int m_iconSize; + bool m_textSynced:1; + bool m_isVisible:1; + bool m_enabled:1; + bool m_parentEnabled:1; + bool m_isSeparator:1; + bool m_checked:1; + bool m_merged:1; }; QT_END_NAMESPACE |