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

Reverting merge request 916

Browse Source 
Revert "Build fix on QMenuBar"

This reverts commit ea585d567bf0970c57e31846da044295d80774ba.
(cherry picked from commit 68542b72f53f52df43063677e24994463872e81b)
This commit is contained in:
Gabriel de Dietrich 2011-04-14 14:50:33 +02:00 committed by Olivier Goffart
parent d9cc2f8ff2
commit 9b609e1c05
2 changed files with 3 additions and 1 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;
//calc what I think the size is..
if (action->isSeparator()) {
i f(action->isSeparator()) {
if (style->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q))
separator = i;
continue; //we don't really position these!

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

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