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

Qt4PM: Enable Build File manually

Browse Source 
Build File should be enabled iff current file is a source file
and current project is not building

Change-Id: I8b5a083b79d00cbe49ff3e5df29f07fd4db94f71
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-05-11 13:31:06 +03:00
committed by Daniel Teske
parent 32b5bd2778
commit 9aa69344c5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
View File

@@ -255,7 +255,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
connect(m_cleanSubProjectAction, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(cleanSubDirContextMenu())); connect(m_cleanSubProjectAction, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(cleanSubDirContextMenu()));
m_buildFileAction = new Utils::ParameterAction(tr("Build File"), tr("Build File \"%1\""), m_buildFileAction = new Utils::ParameterAction(tr("Build File"), tr("Build File \"%1\""),
Utils::ParameterAction::EnabledWithParameter, this); Utils::ParameterAction::AlwaysEnabled, this);
command = am->registerAction(m_buildFileAction, Constants::BUILDFILE, projectContext); command = am->registerAction(m_buildFileAction, Constants::BUILDFILE, projectContext);
command->setAttribute(Core::Command::CA_Hide); command->setAttribute(Core::Command::CA_Hide);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);
@@ -385,7 +385,7 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
m_rebuildSubProjectAction->setParameter(subProjectName); m_rebuildSubProjectAction->setParameter(subProjectName);
m_cleanSubProjectAction->setParameter(subProjectName); m_cleanSubProjectAction->setParameter(subProjectName);
m_buildSubProjectContextMenu->setParameter(subProjectName); m_buildSubProjectContextMenu->setParameter(subProjectName);
m_buildFileAction->setParameter(node ? QFileInfo(node->path()).fileName() : QString()); m_buildFileAction->setParameter(buildFilePossible ? QFileInfo(fileNode->path()).fileName() : QString());
Qt4BuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ? Qt4BuildConfiguration *buildConfiguration = (qt4Project && qt4Project->activeTarget()) ?
qt4Project->activeTarget()->activeQt4BuildConfiguration() : 0; qt4Project->activeTarget()->activeQt4BuildConfiguration() : 0;
@@ -411,6 +411,7 @@ void Qt4ProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
m_cleanSubProjectContextMenu->setEnabled(enabled && isProjectNode); m_cleanSubProjectContextMenu->setEnabled(enabled && isProjectNode);
m_runQMakeActionContextMenu->setEnabled(isProjectNode && !isBuilding m_runQMakeActionContextMenu->setEnabled(isProjectNode && !isBuilding
&& buildConfiguration->qmakeStep()); && buildConfiguration->qmakeStep());
m_buildFileAction->setEnabled(buildFilePossible && !isBuilding);
} }
void Qt4ProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *pro) void Qt4ProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *pro)