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

Enable Build File for files included by pri

Browse Source 
Task-number: QTCREATORBUG-10546

Change-Id: I7b87d4907164840d2c40b70cf919eb31aefebff8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-28 19:42:56 +02:00
committed by Orgad Shaneh
parent ac71bee072
commit dc5ba1127d
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qt4projectmanager/qmakeprojectmanager.cpp
View File

@@ -244,7 +244,7 @@ void Qt4Manager::buildFileContextMenu()
void Qt4Manager::buildFile()
{
if (Core::IDocument *currentDocument= Core::EditorManager::currentDocument()) {
QString file = currentDocument->filePath();
const QString file = currentDocument->filePath();
FileNode *node = qobject_cast<FileNode *>(SessionManager::nodeForFile(file));
Project *project = SessionManager::projectForFile(file);
@@ -276,9 +276,14 @@ void Qt4Manager::handleSubDirContextMenu(Qt4Manager::Action action, bool isFileB
if (!bc)
return;
if (contextNode != 0 && (contextNode != qt4pro->rootProjectNode() || isFileBuild))
if (Qt4ProFileNode *profile = qobject_cast<Qt4ProFileNode *>(contextNode))
bc->setSubNodeBuild(profile);
if (contextNode) {
if (Qt4PriFileNode *prifile = qobject_cast<Qt4PriFileNode *>(contextNode)) {
if (Qt4ProFileNode *profile = prifile->proFileNode()) {
if (profile != qt4pro->rootProjectNode() || isFileBuild)
bc->setSubNodeBuild(profile);
}
}
}
if (isFileBuild)
bc->setFileNodeBuild(contextFile);