summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-12-08 12:17:50 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-12-08 12:17:50 (GMT)
commit03a1ba5621df588bcbbe9daffd5cf5fa4df9b570 (patch)
treefe046e03f240e4bb4f6873d3ec0212d38a60b7bc /src
parent7f4e85fbf14395adf16cf76eb342bd57c15e0f71 (diff)
parent0b728313dbca3ca6ea54bb8f533dbe70028f96e0 (diff)
downloadQt-03a1ba5621df588bcbbe9daffd5cf5fa4df9b570.zip
Qt-03a1ba5621df588bcbbe9daffd5cf5fa4df9b570.tar.gz
Qt-03a1ba5621df588bcbbe9daffd5cf5fa4df9b570.tar.bz2
Merge commit 'refs/merge-requests/2509' of gitorious.org:qt/qt into integration
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qmenu.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 538df35..2e42cdb 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -1319,6 +1319,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