diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakenodes.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index d17ccfd5a1..06f9cb4502 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -26,7 +26,6 @@ #include "qmakenodes.h" #include "qmakeproject.h" -#include "qmakeprojectmanager.h" #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/runconfiguration.h> @@ -343,7 +342,7 @@ bool QmakeProFileNode::validParse() const void QmakeProFileNode::build() { - QmakeManager::buildProduct(getProject(), this); + m_buildSystem->buildHelper(QmakeBuildSystem::BUILD, false, this, nullptr); } QStringList QmakeProFileNode::targetApplications() const @@ -359,7 +358,7 @@ QStringList QmakeProFileNode::targetApplications() const return apps; } -QVariant QmakeProFileNode::data(Core::Id role) const +QVariant QmakeProFileNode::data(Utils::Id role) const { if (role == Android::Constants::AndroidPackageSourceDir) return singleVariableValue(Variable::AndroidPackageSourceDir); @@ -413,7 +412,7 @@ QVariant QmakeProFileNode::data(Core::Id role) const return {}; } -bool QmakeProFileNode::setData(Core::Id role, const QVariant &value) const +bool QmakeProFileNode::setData(Utils::Id role, const QVariant &value) const { QmakeProFile *pro = proFile(); if (!pro) @@ -506,12 +505,6 @@ QString QmakeProFileNode::singleVariableValue(const Variable var) const return values.isEmpty() ? QString() : values.first(); } -FilePath QmakeProFileNode::buildDir(BuildConfiguration *bc) const -{ - const QmakeProFile *pro = proFile(); - return pro ? pro->buildDir(bc) : FilePath(); -} - QString QmakeProFileNode::objectExtension() const { QStringList exts = variableValue(Variable::ObjectExt); |