Commit b3110de6 authored by hjk's avatar hjk

QmakeProject: Some header cleanup

Change-Id: I728e02f7c9e57186013e1696b4c1939186bfd578
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent c523ad46
......@@ -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();
......
......@@ -49,18 +49,13 @@ namespace ProjectExplorer { class DeploymentData; }
namespace QtSupport { class ProFileReader; }
namespace QmakeProjectManager {
class MakeStep;
class QMakeStep;
class QmakeBuildConfiguration;
class QmakeManager;
class QmakePriFileNode;
class QmakeProFileNode;
class TargetInformation;
namespace Internal {
class CentralizedFolderWatcher;
class FileItem;
class GCCPreprocessor;
class QmakeProjectFiles;
class QmakeProjectConfigWidget;
class QmakeProjectFile;
......@@ -180,7 +175,6 @@ private:
ProjectExplorer::DeploymentData &deploymentData);
void collectLibraryData(const QmakeProFileNode *node,
ProjectExplorer::DeploymentData &deploymentData);
QString destDirFor(const TargetInformation &ti);
QmakeManager *m_manager;
QmakeProFileNode *m_rootProjectNode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment