diff options
| author | Karim Pinter <ext-karim.1.pinter@nokia.com> | 2010-12-07 09:46:55 (GMT) |
|---|---|---|
| committer | Karim Pinter <ext-karim.1.pinter@nokia.com> | 2010-12-07 09:46:55 (GMT) |
| commit | 700ce118e1f294148fbbd9b92672f9ff7ec21f8e (patch) | |
| tree | 439fbf45afb24931326f53225d278af23cf5d7dc /src/gui/widgets/qmenu.cpp | |
| parent | 87291d518beb131b5b80540d46d53b54c2366a9c (diff) | |
| download | Qt-700ce118e1f294148fbbd9b92672f9ff7ec21f8e.zip Qt-700ce118e1f294148fbbd9b92672f9ff7ec21f8e.tar.gz Qt-700ce118e1f294148fbbd9b92672f9ff7ec21f8e.tar.bz2 | |
Updating merge request 2512
Removing unnecessary comments and changing define to Q_OS_SYMBIAN.
Task-number: QTBUG_9505
Diffstat (limited to 'src/gui/widgets/qmenu.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index d9233f5..538df35 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -1795,9 +1795,7 @@ QSize QMenu::sizeHint() const void QMenu::popup(const QPoint &p, QAction *atAction) { Q_D(QMenu); -#ifndef Q_WS_S60 - //on S60 opens the menu at the same position it was activated last time - //there is no need to reset the offset fix for QTBUG-9505 +#ifndef Q_OS_SYMBIAN if (d->scroll) { // reset scroll state from last popup d->scroll->scrollOffset = 0; d->scroll->scrollFlags = QMenuPrivate::QMenuScroller::ScrollNone; |