diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
| commit | 0ca4fcbc36527ce02b604aa88e8bd0d37d40baf4 (patch) | |
| tree | 6adf165fb783272d720416a49a51d9ad169d16de /src/plugins/platforms/cocoa/qcocoamenu.h | |
| parent | 9aeaa363e533e1486e6e9d7526bbab7c2472be5e (diff) | |
| parent | 748aa6b06462804a9671997302df292ae9788d5c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/xcb/qxcbintegration.cpp
Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h index 6b80162e4d..b77071536b 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.h +++ b/src/plugins/platforms/cocoa/qcocoamenu.h @@ -71,7 +71,7 @@ public: void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE; - void syncModalState(bool modal); + void propagateEnabledState(bool enabled); void setIcon(const QIcon &icon) Q_DECL_OVERRIDE { Q_UNUSED(icon) } @@ -104,9 +104,10 @@ private: NSMenu *m_nativeMenu; NSMenuItem *m_attachedItem; quintptr m_tag; - bool m_enabled; - bool m_visible; - bool m_isOpen; + bool m_enabled:1; + bool m_parentEnabled:1; + bool m_visible:1; + bool m_isOpen:1; }; QT_END_NAMESPACE |