diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
| commit | c3cc73e3087db62a8427ff569abff1a8289dae83 (patch) | |
| tree | 9839a823f220f57775a732658b8aab0fa4ba9be3 /src/imports/platform/widgets/qwidgetplatformmenu_p.h | |
| parent | 2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff) | |
| parent | bc514fba81b67afb41ee91ea917352ad674630a5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
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 |