feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove some workarounds for Qt bugs that have been fixed.

Browse Source 
Change-Id: I0e7112ee3f3790fba42fc882cb98e06ec6a2186d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-04-30 11:21:28 +02:00
parent 9073c55035
commit 8b833b8261
4 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -419,27 +419,11 @@ void MenuActionContainer::removeMenu(QMenu *menu)
m_menu->removeAction(menu->menuAction());
}
static bool menuInMenuBar(const QMenu *menu)
{
foreach (const QWidget *widget, menu->menuAction()->associatedWidgets()) {
if (qobject_cast<const QMenuBar *>(widget))
return true;
}
return false;
}
bool MenuActionContainer::updateInternal()
{
if (onAllDisabledBehavior() == Show)
return true;
if (Utils::HostOsInfo::isMacHost()) {
// work around QTBUG-25544 which makes menus in the menu bar stay at their enabled state at startup
// (so menus that are disabled at startup would stay disabled)
if (menuInMenuBar(m_menu))
return true;
}
bool hasitems = false;
QList<QAction *> actions = m_menu->actions();