Changeset 651 for trunk/src/gui/widgets/qmenu_symbian.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qmenu_symbian.cpp (modified) (5 diffs)

trunk/src/gui/widgets/qmenu_symbian.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -82 +82 @@
 static QPointer<QWidget> widgetWithContextMenu;
 static QList<QAction*> contextMenuActionList;
+
 static int contexMenuCommand=0;
 
@@ -225 +226 @@
 
 #ifdef Q_WS_S60
+
+
+
+
+
 void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
     if (!menuExists())
         return;
@@ -272 +291 @@
 {
     Q_Q(QMenuBar);
-    if (parent && parent->isWindow()){
-        menubars()->insert(q->window(), this);
-        symbian_menubar = new QSymbianMenuBarPrivate(this);
-        nativeMenuBars.append(q);
+    if (parent) {
+        if(parent->isWindow()) {
+            menubars()->insert(q->window(), this);
+            symbian_menubar = new QSymbianMenuBarPrivate(this);
+            nativeMenuBars.append(q);
+        } else {
+            menubars()->insert(q->parentWidget(), this);
+            symbian_menubar = new QSymbianMenuBarPrivate(this);
+            nativeMenuBars.append(q);
+        }
     }
 }
@@ -285 +310 @@
     nativeMenuBars.removeAt(index);
     menubars()->remove(q->window(), this);
+
     rebuildMenu();
     if (symbian_menubar)