From 0c9c17aa25253a9fcab2e7581fe23d0e47eaf013 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 20 Oct 2014 09:53:31 +0200 Subject: [PATCH] Help: Resolve shortcut conflict between index and C++ type hierarchy By making the global Help menu items (index & contents) independent from the help view shortcuts again. Change-Id: I1008efd0bfa95a5b3134edae9e324b106273a708 Reviewed-by: Orgad Shaneh --- src/plugins/help/helpplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index c686f7eec78..f5a533da3c5 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -179,12 +179,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) // Add Contents, Index, and Context menu items action = new QAction(QIcon::fromTheme(QLatin1String("help-contents")), tr(Constants::SB_CONTENTS), this); - cmd = ActionManager::registerAction(action, Constants::HELP_CONTENTS, globalcontext); + cmd = ActionManager::registerAction(action, "Help.ContentsMenu", globalcontext); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, SIGNAL(triggered()), this, SLOT(activateContents())); action = new QAction(tr(Constants::SB_INDEX), this); - cmd = ActionManager::registerAction(action, "Help.Index", globalcontext); + cmd = ActionManager::registerAction(action, "Help.IndexMenu", globalcontext); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, SIGNAL(triggered()), this, SLOT(activateIndex()));