From 700ce118e1f294148fbbd9b92672f9ff7ec21f8e Mon Sep 17 00:00:00 2001
From: Karim Pinter <ext-karim.1.pinter@nokia.com>
Date: Tue, 7 Dec 2010 11:46:55 +0200
Subject: Updating merge request 2512

Removing unnecessary comments and changing define to Q_OS_SYMBIAN.

Task-number: QTBUG_9505
---
 src/gui/widgets/qmenu.cpp | 4 +---
 1 file changed, 1 insertion(+), 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;
-- 
cgit v0.12