AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fix on QMenuBar

Browse Source 
Reviewed-By: gabi
Merge-Request: 916
(cherry picked from commit ea585d567bf0970c57e31846da044295d80774ba)
This commit is contained in:
Thierry Bastian 2011-04-14 14:12:56 +02:00 committed by Olivier Goffart
parent 4bfcb2febe
commit 95d7a4e8ea
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,7 +441,7 @@ void QMenuBarPrivate::calcActionRects(int max_width, int start) const
QSize sz; QSize sz;
//calc what I think the size is.. //calc what I think the size is..
i f(action->isSeparator()) { if (action->isSeparator()) {
if (style->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q)) if (style->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q))
separator = i; separator = i;
continue; //we don't really position these! continue; //we don't really position these!

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

@ -120,12 +120,10 @@ void QMenuBarImpl::actionEvent(QActionEvent *e)
void QMenuBarImpl::handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow) void QMenuBarImpl::handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow)
{ {
#ifdef Q_WS_X11
Q_UNUSED(oldParent) Q_UNUSED(oldParent)
Q_UNUSED(newParent) Q_UNUSED(newParent)
Q_UNUSED(oldWindow) Q_UNUSED(oldWindow)
Q_UNUSED(newWindow) Q_UNUSED(newWindow)
#endif
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
if (isNativeMenuBar() && !macWidgetHasNativeMenubar(newParent)) { if (isNativeMenuBar() && !macWidgetHasNativeMenubar(newParent)) {