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

ProjectNode: Rename path() to filePath()

Browse Source 
Change-Id: I78bb73f8c9457fd74c470eacbf54eb9195ac9681
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-29 17:53:47 +01:00
parent 6d9ff690c7
commit 5d7f5a2a32
43 changed files with 210 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -126,7 +126,7 @@ QString QMakeStep::allArguments(bool shorted)
QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
QStringList arguments;
if (bc->subNodeBuild())
arguments << bc->subNodeBuild()->path().toUserOutput();
arguments << bc->subNodeBuild()->filePath().toUserOutput();
else if (shorted)
arguments << project()->projectFilePath().fileName();
else
@@ -235,7 +235,7 @@ bool QMakeStep::init()
QmakeProFileNode *node = static_cast<QmakeProject *>(qt4bc->target()->project())->rootQmakeProjectNode();
if (qt4bc->subNodeBuild())
node = qt4bc->subNodeBuild();
QString proFile = node->path().toString();
QString proFile = node->filePath().toString();
QList<ProjectExplorer::Task> tasks = qtVersion->reportIssues(proFile, workingDirectory);
Utils::sort(tasks);