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

qmake: Simplify QmakeProFileNode::buildDir()

Browse Source 
The optional BuildConfiguration parameter is never used.

Change-Id: Ic5773616920702134848507ef2801a7723e8b65c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-02-24 18:01:54 +01:00
parent 8b5b1f1de7
commit 1328b04e7b
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -25,14 +25,12 @@
#include "qmakenodes.h" #include "qmakenodes.h"
#include "qmakeproject.h" #include "qmakeproject.h"
#include "qmakebuildconfiguration.h"
#include "qmakerunconfigurationfactory.h" #include "qmakerunconfigurationfactory.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/profilereader.h>
#include <resourceeditor/resourcenode.h> #include <resourceeditor/resourcenode.h>
#include <utils/algorithm.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -259,15 +257,16 @@ QString QmakeProFileNode::singleVariableValue(const Variable var) const
return values.isEmpty() ? QString() : values.first(); return values.isEmpty() ? QString() : values.first();
} }
QString QmakeProFileNode::buildDir(QmakeBuildConfiguration *bc) const QString QmakeProFileNode::buildDir() const
{ {
if (Target *target = m_project->activeTarget()) {
if (BuildConfiguration *bc = target->activeBuildConfiguration()) {
const QDir srcDirRoot(m_project->projectDirectory().toString()); const QDir srcDirRoot(m_project->projectDirectory().toString());
const QString relativeDir = srcDirRoot.relativeFilePath(filePath().parentDir().toString()); const QString relativeDir = srcDirRoot.relativeFilePath(filePath().parentDir().toString());
if (!bc && m_project->activeTarget())
bc = static_cast<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
if (!bc)
return QString();
return QDir::cleanPath(QDir(bc->buildDirectory().toString()).absoluteFilePath(relativeDir)); return QDir::cleanPath(QDir(bc->buildDirectory().toString()).absoluteFilePath(relativeDir));
} }
}
return QString();
}
} // namespace QmakeProjectManager } // namespace QmakeProjectManager

12
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -30,22 +30,13 @@
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
#include <QStringList>
#include <QMap>
namespace Utils { class FileName; } namespace Utils { class FileName; }
namespace ProjectExplorer { class RunConfiguration; } namespace ProjectExplorer { class RunConfiguration; }
namespace QmakeProjectManager { namespace QmakeProjectManager {
class QmakeBuildConfiguration;
class QmakeProFileNode; class QmakeProFileNode;
class QmakeProject; class QmakeProject;
namespace Internal {
struct InternalNode;
class PriFileEvalResult;
} // namespace Internal
// Implements ProjectNode for qmake .pri files // Implements ProjectNode for qmake .pri files
class QMAKEPROJECTMANAGER_EXPORT QmakePriFileNode : public ProjectExplorer::ProjectNode class QMAKEPROJECTMANAGER_EXPORT QmakePriFileNode : public ProjectExplorer::ProjectNode
{ {
@@ -97,12 +88,11 @@ public:
AddNewInformation addNewInformation(const QStringList &files, Node *context) const override; AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
QmakeProjectManager::ProjectType projectType() const; QmakeProjectManager::ProjectType projectType() const;
QString buildDir() const;
QStringList variableValue(const Variable var) const; QStringList variableValue(const Variable var) const;
QString singleVariableValue(const Variable var) const; QString singleVariableValue(const Variable var) const;
QString buildDir(QmakeBuildConfiguration *bc = nullptr) const;
QmakeProFileNode *findProFileFor(const Utils::FileName &string) const; QmakeProFileNode *findProFileFor(const Utils::FileName &string) const;
bool showInSimpleTree(ProjectType projectType) const; bool showInSimpleTree(ProjectType projectType) const;