Moved softkey "Options" action handling from QMainWindow to QMenuBar.

This change is done to enable QMenuBar usage and related "Options"
softkey also on other than QMainWindow objects. For example with this
change it is possible to create menubar and set it to QLayout by using
setMenuBar, and it will then be usable via "Options" softkey.

This functionality makes it easy to use different menus for different
views in QStackedWidget.

Task-number: QT-2275        (Not yet finished, but related)
Reviewed-by: Sami Merila
Reviewed-by: Alessandro Portale

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index e46688c..7224768 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -324,6 +324,14 @@ void QMenuBarPrivate::symbianDestroyMenuBar()
     symbian_menubar = 0;
 }
 
+void QMenuBarPrivate::reparentMenuBar(QWidget *oldParent, QWidget *newParent)
+{
+    if (menubars()->contains(oldParent)) {
+        QMenuBarPrivate *object = menubars()->take(oldParent);
+        menubars()->insert(newParent, object);
+    }
+}
+
 QMenuBarPrivate::QSymbianMenuBarPrivate::QSymbianMenuBarPrivate(QMenuBarPrivate *menubar)
 {
     d = menubar;