diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-07 13:28:10 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-08 10:45:08 +0000 |
| commit | e6eaf29c69f0f352fc8279b9f508ae468d18cafd (patch) | |
| tree | 2ec01eda5bdb29387cc7264327b7034d4f704051 /src/imports/platform/widgets/qwidgetplatformmenu_p.h | |
| parent | 8732b0681b99e5de01d6f53de33306ca70b01171 (diff) | |
Platform Menus: support sub menus in the Qt Widgets fallback menus
Implement all the missing things and fix the type of the cast in
QWidgetPlatformMenuItem::setMenu() to make sub menus work with the
widgets fallbacks.
Change-Id: I19bb010a5c639a77b76d1d92a47ad03576c06d2f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/platform/widgets/qwidgetplatformmenu_p.h')
| -rw-r--r-- | src/imports/platform/widgets/qwidgetplatformmenu_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/platform/widgets/qwidgetplatformmenu_p.h b/src/imports/platform/widgets/qwidgetplatformmenu_p.h index 2eea6470..1df9ef78 100644 --- a/src/imports/platform/widgets/qwidgetplatformmenu_p.h +++ b/src/imports/platform/widgets/qwidgetplatformmenu_p.h @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE class QMenu; +class QWidgetPlatformMenuItem; class QWidgetPlatformMenu : public QPlatformMenu { @@ -91,7 +92,9 @@ public: QPlatformMenu *createSubMenu() const override; private: + quintptr m_tag; QScopedPointer<QMenu> m_menu; + QVector<QWidgetPlatformMenuItem *> m_items; }; QT_END_NAMESPACE |