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

Don't build current file when build of subproject is requested.

Browse Source 
Change-Id: I0432c5d90fa6eb762745f458693747383cf5b0d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Konstantin Tokarev
2012-05-14 15:41:55 +04:00
committed by Daniel Teske
parent 5a3431ea32
commit 406a3d5f51
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt4projectmanager.cpp
View File

@@ -400,20 +400,25 @@ void Qt4Manager::runQMake(ProjectExplorer::Project *p, ProjectExplorer::Node *no
void Qt4Manager::buildSubDirContextMenu()
{
handleSubDirContextMenu(BUILD);
handleSubDirContextMenu(BUILD, false);
}
void Qt4Manager::cleanSubDirContextMenu()
{
handleSubDirContextMenu(CLEAN);
handleSubDirContextMenu(CLEAN, false);
}
void Qt4Manager::rebuildSubDirContextMenu()
{
handleSubDirContextMenu(REBUILD);
handleSubDirContextMenu(REBUILD, false);
}
void Qt4Manager::handleSubDirContextMenu(Qt4Manager::Action action)
void Qt4Manager::buildFileContextMenu()
{
handleSubDirContextMenu(BUILD, true);
}
void Qt4Manager::handleSubDirContextMenu(Qt4Manager::Action action, bool isFileBuild)
{
Qt4Project *qt4pro = qobject_cast<Qt4Project *>(m_contextProject);
QTC_ASSERT(qt4pro, return);
@@ -427,7 +432,7 @@ void Qt4Manager::handleSubDirContextMenu(Qt4Manager::Action action)
if (Qt4ProFileNode *profile = qobject_cast<Qt4ProFileNode *>(m_contextNode))
bc->setSubNodeBuild(profile);
if (m_contextFile)
if (isFileBuild && m_contextFile)
bc->setFileNodeBuild(m_contextFile);
if (projectExplorer()->saveModifiedFiles()) {
const Core::Id buildStep = Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD);