Fix copyright and a few codestyle mistakes
Reviewed-By: Trust-Me Merge-Request: 916 (cherry picked from commit 56c3de426d97ab7c8fbb3f5766e1872d6f2e91e9)
This commit is contained in:
parent
278b4ed012
commit
2e768aad98
@ -1816,12 +1816,10 @@ void QMenuBar::setCornerWidget(QWidget *w, Qt::Corner corner)
|
||||
|
||||
if (!d->impl->allowCornerWidgets()) {
|
||||
d->updateCornerWidgetToolBar();
|
||||
} else {
|
||||
if (w) {
|
||||
} else if (w) {
|
||||
w->setParent(this);
|
||||
w->installEventFilter(this);
|
||||
}
|
||||
}
|
||||
|
||||
d->_q_updateLayout();
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
@ -38,6 +38,7 @@
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qmenubarimpl_p.h"
|
||||
|
||||
#ifndef QT_NO_MENUBAR
|
||||
@ -83,8 +84,7 @@ void QMenuBarImpl::init(QMenuBar *_menuBar)
|
||||
wceCreateMenuBar(menuBar->parentWidget());
|
||||
if (adapter)
|
||||
menuBar->hide();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
|
||||
}
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
@ -38,6 +38,7 @@
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QMENUBARIMPL_P_H
|
||||
#define QMENUBARIMPL_P_H
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user