1 files changed, 36 insertions, 30 deletions

diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 1577977..f27e580 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -4,7 +4,37 @@
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
 **
-** $TROLLTECH_DUAL_EMBEDDED_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -230,13 +260,7 @@ Q_GUI_EXPORT void qt_symbian_show_submenu( CEikMenuPane* menuPane, int id)
     }
 }
 
-void QMenu::symbianCommands(int command)
-{
-    Q_D(QMenu);
-    d->symbianCommands(command);
-}
-
-void QMenuBar::symbianCommands(int command)
+void QMenuBarPrivate::symbianCommands(int command)
 {
     if (command == contexMenuCommand) {
         QContextMenuEvent* event = new QContextMenuEvent(QContextMenuEvent::Keyboard, QPoint(0,0));
@@ -245,32 +269,14 @@ void QMenuBar::symbianCommands(int command)
     
     int size = nativeMenuBars.size();
     for (int i = 0; i < nativeMenuBars.size(); ++i) {
-        bool result = nativeMenuBars.at(i)->d_func()->symbianCommands(command);
-        if (result)
-            return;
-    }
-}
-
-bool QMenuBarPrivate::symbianCommands(int command)
-{
     SymbianMenuItem* menu = qt_symbian_find_menu_item(command, symbianMenus);
     if (!menu)
-        return false;
-
-    emit q_func()->triggered(menu->action);
-    menu->action->activate(QAction::Trigger);
-    return true;
-}
-
-bool QMenuPrivate::symbianCommands(int command)
-{
-    SymbianMenuItem* menu = qt_symbian_find_menu_item(command, symbianMenus);
-    if (!menu)
-        return false;
+            continue;
 
-    emit q_func()->triggered(menu->action);
+        emit nativeMenuBars.at(i)->triggered(menu->action);
     menu->action->activate(QAction::Trigger);
-    return true;
+        break;
+    }
 }
 
 void QMenuBarPrivate::symbianCreateMenuBar(QWidget *parent)