1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix copyright and a few codestyle mistakes

Browse Source 
Reviewed-By: Trust-Me
Merge-Request: 916
(cherry picked from commit 56c3de426d97ab7c8fbb3f5766e1872d6f2e91e9)
This commit is contained in:
Thierry Bastian 2011-04-14 11:26:34 +02:00 committed by Olivier Goffart
parent 278b4ed012
commit 2e768aad98
3 changed files with 113 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/widgets/qmenubar.cpp
View File

@ -1816,12 +1816,10 @@ void QMenuBar::setCornerWidget(QWidget *w, Qt::Corner corner)
if (!d->impl->allowCornerWidgets()) { if (!d->impl->allowCornerWidgets()) {
d->updateCornerWidgetToolBar(); d->updateCornerWidgetToolBar();
} else { } else if (w) {
if (w) {
w->setParent(this); w->setParent(this);
w->installEventFilter(this); w->installEventFilter(this);
} }
}
d->_q_updateLayout(); d->_q_updateLayout();
} }

6
src/gui/widgets/qmenubarimpl.cpp
View File

@ -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. ** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com) ** Contact: Nokia Corporation (qt-info@nokia.com)
** **
@ -38,6 +38,7 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include "qmenubarimpl_p.h" #include "qmenubarimpl_p.h"
#ifndef QT_NO_MENUBAR #ifndef QT_NO_MENUBAR
@ -83,8 +84,7 @@ void QMenuBarImpl::init(QMenuBar *_menuBar)
wceCreateMenuBar(menuBar->parentWidget()); wceCreateMenuBar(menuBar->parentWidget());
if (adapter) if (adapter)
menuBar->hide(); menuBar->hide();
} } else {
else {
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true); QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
} }
#endif #endif

3
src/gui/widgets/qmenubarimpl_p.h
View File

@ -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. ** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com) ** Contact: Nokia Corporation (qt-info@nokia.com)
** **
@ -38,6 +38,7 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#ifndef QMENUBARIMPL_P_H #ifndef QMENUBARIMPL_P_H
#define QMENUBARIMPL_P_H #define QMENUBARIMPL_P_H