diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-12-07 11:47:26 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-12-07 11:47:26 (GMT) |
| commit | 7f4e85fbf14395adf16cf76eb342bd57c15e0f71 (patch) | |
| tree | 9ee2944fb3dac118af8e05e754537b3c1ed7a396 /src | |
| parent | e9cf90cffa279349ee9e84c8bcff0bbad173eaeb (diff) | |
| parent | 700ce118e1f294148fbbd9b92672f9ff7ec21f8e (diff) | |
| download | Qt-7f4e85fbf14395adf16cf76eb342bd57c15e0f71.zip Qt-7f4e85fbf14395adf16cf76eb342bd57c15e0f71.tar.gz Qt-7f4e85fbf14395adf16cf76eb342bd57c15e0f71.tar.bz2 | |
Merge commit 'refs/merge-requests/2512' of gitorious.org:qt/qt into integration
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 4bea6de..538df35 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -1795,10 +1795,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; |