diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-15 13:15:13 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-15 13:15:13 (GMT) |
| commit | b5b3e65f6e0392239621a3888d9aa58746f3899e (patch) | |
| tree | 5c33473950b22db0a0eb9c230005cd8e7f251538 /src/gui/widgets/qmenu.cpp | |
| parent | cace8e6a9f00ee478dfe63a7fa6959056cfe7e8a (diff) | |
| parent | 0c6780c39d18a4fd06b9bed94400de365a518c45 (diff) | |
| download | Qt-b5b3e65f6e0392239621a3888d9aa58746f3899e.zip Qt-b5b3e65f6e0392239621a3888d9aa58746f3899e.tar.gz Qt-b5b3e65f6e0392239621a3888d9aa58746f3899e.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Diffstat (limited to 'src/gui/widgets/qmenu.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 4bea6de..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 @@ -1795,10 +1798,12 @@ QSize QMenu::sizeHint() const void QMenu::popup(const QPoint &p, QAction *atAction) { Q_D(QMenu); +#ifndef Q_OS_SYMBIAN if (d->scroll) { // reset scroll state from last popup d->scroll->scrollOffset = 0; d->scroll->scrollFlags = QMenuPrivate::QMenuScroller::ScrollNone; } +#endif d->tearoffHighlighted = 0; d->motions = 0; d->doChildEffects = true; |