diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-08 16:09:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-08 16:09:42 (GMT) |
| commit | 694ef883b3ab40806bfe3356278c639942c8c69d (patch) | |
| tree | abbd21be2f1d4ab1bd2c760685acd6b342b51915 | |
| parent | bcbe4f07ff2e1246899e2988d778d7a824919b6c (diff) | |
| parent | 3ca55de912dc01e23fc01d4aab953c08619a51a9 (diff) | |
| download | Qt-694ef883b3ab40806bfe3356278c639942c8c69d.zip Qt-694ef883b3ab40806bfe3356278c639942c8c69d.tar.gz Qt-694ef883b3ab40806bfe3356278c639942c8c69d.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Remove whitespace and leading tab from documentation change
Adding warning to QMenu documentation
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 538df35..74c2a9e 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -1320,6 +1320,9 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) Conversely, actions can be added to widgets with the addAction(), addActions() and insertAction() functions. + \warning To make QMenu visible on the screen, exec() or popup() should be + used instead of show(). + \section1 QMenu on Qt for Windows CE If a menu is integrated into the native menubar on Windows Mobile we |