Merge remote-tracking branch 'origin/4.2'

Change-Id: I8896af66cf8af7436cf3946ddb013742260d50a9
This commit is contained in:
Eike Ziller
2017-02-01 14:07:35 +01:00
9 changed files with 41 additions and 26 deletions

View File

@@ -212,7 +212,7 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
m_buildFileAction = new Utils::ParameterAction(tr("Build File"), tr("Build File \"%1\""),
Utils::ParameterAction::AlwaysEnabled, this);
command = ActionManager::registerAction(m_buildFileAction, Constants::BUILDFILE);
command = ActionManager::registerAction(m_buildFileAction, Constants::BUILDFILE, projectContext);
command->setAttribute(Command::CA_Hide);
command->setAttribute(Command::CA_UpdateText);
command->setDescription(m_buildFileAction->text());