diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/widgets/widgets/qmenu.cpp | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 4567f7c2a3..955d445b24 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1535,6 +1535,8 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) \ingroup basicwidgets \inmodule QtWidgets + \image fusion-menu.png + A menu widget is a selection menu. It can be either a pull-down menu in a menu bar or a standalone context menu. Pull-down menus are shown by the menu bar when the user clicks on the respective @@ -1546,14 +1548,6 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) response to button presses; these are just like context menus except for how they are invoked. - \table 100% - \row - \li \inlineimage fusion-menu.png - \li \inlineimage macintosh-menu.png - \endtable - \caption Fig. A menu shown in \l{Fusion Style Widget Gallery}{Fusion widget style} - and \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \section1 Actions A menu consists of a list of action items. Actions are added with |