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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/widgets/qmenu_symbian.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
     
    8282static QPointer<QWidget> widgetWithContextMenu;
    8383static QList<QAction*> contextMenuActionList;
     84
    8485static int contexMenuCommand=0;
    8586
     
    225226
    226227#ifdef Q_WS_S60
     228
     229
     230
     231
     232
    227233void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
    228234{
     235
     236
     237
     238
     239
     240
     241
     242
     243
     244
     245
     246
     247
    229248    if (!menuExists())
    230249        return;
     
    272291{
    273292    Q_Q(QMenuBar);
    274     if (parent && parent->isWindow()){
    275         menubars()->insert(q->window(), this);
    276         symbian_menubar = new QSymbianMenuBarPrivate(this);
    277         nativeMenuBars.append(q);
     293    if (parent) {
     294        if(parent->isWindow()) {
     295            menubars()->insert(q->window(), this);
     296            symbian_menubar = new QSymbianMenuBarPrivate(this);
     297            nativeMenuBars.append(q);
     298        } else {
     299            menubars()->insert(q->parentWidget(), this);
     300            symbian_menubar = new QSymbianMenuBarPrivate(this);
     301            nativeMenuBars.append(q);
     302        }
    278303    }
    279304}
     
    285310    nativeMenuBars.removeAt(index);
    286311    menubars()->remove(q->window(), this);
     312
    287313    rebuildMenu();
    288314    if (symbian_menubar)
Note: See TracChangeset for help on using the changeset viewer.