From 3b177faccebf5677e42f205aee7a6085427392aa Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 15 Nov 2010 12:01:50 +0100
Subject: [PATCH] Some menus where missing a setEmptyAction(EA_None) call.
Was exposed by fixing the empty action mechanism in
d7e7c3427d878cadbdce26f12ef39aceafbff966.
---
src/plugins/coreplugin/mainwindow.cpp | 1 +
src/plugins/projectexplorer/projectexplorer.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 773190073ad..cdc38e30b11 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -579,6 +579,7 @@ void MainWindow::registerDefaultActions()
ActionContainer *ac = am->createMenu(Constants::M_FILE_RECENTFILES);
mfile->addMenu(ac, Constants::G_FILE_OPEN);
ac->menu()->setTitle(tr("Recent &Files"));
+ ac->setEmptyAction(ActionContainer::EA_None);
// Save Action
icon = QIcon::fromTheme(QLatin1String("document-save"), QIcon(Constants::ICON_SAVEFILE));
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 77d1822f819..4abac06f66a 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -526,6 +526,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
Core::ActionContainer *mrecent =
am->createMenu(Constants::M_RECENTPROJECTS);
mrecent->menu()->setTitle(tr("Recent P&rojects"));
+ mrecent->setEmptyAction(Core::ActionContainer::EA_None);
mfile->addMenu(mrecent, Core::Constants::G_FILE_OPEN);
connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateRecentProjectMenu()));
@@ -548,6 +549,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
// session menu
Core::ActionContainer *msession = am->createMenu(Constants::M_SESSION);
msession->menu()->setTitle(tr("Session"));
+ msession->setEmptyAction(Core::ActionContainer::EA_None);
mfile->addMenu(msession, Core::Constants::G_FILE_PROJECT);
d->m_sessionMenu = msession->menu();
connect(mfile->menu(), SIGNAL(aboutToShow()),
--
GitLab