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

QmakeProject: Some header cleanup

Browse Source 
Change-Id: I728e02f7c9e57186013e1696b4c1939186bfd578
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
hjk
2014-04-08 17:28:39 +02:00
parent c523ad46fa
commit b3110de645
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -1514,6 +1514,15 @@ void QmakeProject::collectApplicationData(const QmakeProFileNode *node, Deployme
DeployableFile::TypeExecutable);
}
static QString destDirFor(const TargetInformation &ti)
{
if (ti.destDir.isEmpty())
return ti.buildDir;
if (QDir::isRelativePath(ti.destDir))
return QDir::cleanPath(ti.buildDir + QLatin1Char('/') + ti.destDir);
return ti.destDir;
}
void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentData &deploymentData)
{
const QString targetPath = node->installsList().targetPath;
@@ -1599,15 +1608,6 @@ void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentDa
}
}
QString QmakeProject::destDirFor(const TargetInformation &ti)
{
if (ti.destDir.isEmpty())
return ti.buildDir;
if (QDir::isRelativePath(ti.destDir))
return QDir::cleanPath(ti.buildDir + QLatin1Char('/') + ti.destDir);
return ti.destDir;
}
QString QmakeProject::executableFor(const QmakeProFileNode *node)
{
const ProjectExplorer::Kit * const kit = activeTarget()->kit();