diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index ba230a2f95405c236202f75fe69748b9ea43cbf4..1689bbe23f8f8a5f195119004256af2ba67d5aeb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -37,7 +37,7 @@ CMakeProjectNode::CMakeProjectNode(const QString &fileName) { } -bool CMakeProjectNode::hasTargets() const +bool CMakeProjectNode::hasBuildTargets() const { // TODO return true; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index 215ef6645a3c32633feb632e07b2a5e148bab6fc..5d857b951702f35188fb16a5f1d59234712b8df6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -41,7 +41,7 @@ class CMakeProjectNode : public ProjectExplorer::ProjectNode friend class CMakeProject; public: CMakeProjectNode(const QString &fileName); - virtual bool hasTargets() const; + virtual bool hasBuildTargets() const; virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions() const; virtual bool addSubProjects(const QStringList &proFilePaths); virtual bool removeSubProjects(const QStringList &proFilePaths); diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp index 0bb0184448af2b534982298d3326171f9f5cb55e..c1c936fec0c3a02204f7b8f62931f43aa9ac14b9 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp +++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp @@ -162,7 +162,7 @@ ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName(const return findOrCreateFolderByName(components, components.length()); } -bool GenericProjectNode::hasTargets() const +bool GenericProjectNode::hasBuildTargets() const { return true; } diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h index 9885592200cb189022510b1c8baaac98dce0fc3e..eee5cb82d9806a05948616c9e6998e2891b28f09 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.h +++ b/src/plugins/genericprojectmanager/genericprojectnodes.h @@ -53,7 +53,7 @@ public: Core::IFile *projectFile() const; QString projectFilePath() const; - virtual bool hasTargets() const; + virtual bool hasBuildTargets() const; virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions() const; diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index de589580fdaa40e900fbd465c0d8638b0decbdd7..9b8fec7b32283fa41e083601428c8c517ff3e670 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -481,7 +481,7 @@ bool FlatModel::filter(Node *node) const isHidden = false; } else if (ProjectNode *projectNode = qobject_cast<ProjectNode*>(node)) { if (m_filterProjects && projectNode->parentFolderNode() != m_rootNode) - isHidden = !projectNode->hasTargets(); + isHidden = !projectNode->hasBuildTargets(); } else if (node->nodeType() == FolderNodeType) { if (m_filterProjects) isHidden = true; diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 422a113b42f624f422e313ecb9170ab12493074a..6d35d0cbb61b26bf37927c68571ac3294163aa10 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -167,7 +167,7 @@ public: // determines if the project will be shown in the flat view // TODO find a better name - virtual bool hasTargets() const = 0; + virtual bool hasBuildTargets() const = 0; virtual QList<ProjectAction> supportedActions() const = 0; diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp index b48b5b36edbf2c3c9543b00448c0c9452814afa1..b1ff8f8c5fbfcf008776bef113007579f0ffb6f1 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp @@ -157,7 +157,7 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr return findOrCreateFolderByName(components, components.length()); } -bool QmlProjectNode::hasTargets() const +bool QmlProjectNode::hasBuildTargets() const { return true; } diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h index 1682e3964cee71eceb2a8f4d17f9486a58df2d78..04e4be3fbd530605f0e68d5ac7eee8f21ca7ba70 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h @@ -54,7 +54,7 @@ public: Core::IFile *projectFile() const; QString projectFilePath() const; - virtual bool hasTargets() const; + virtual bool hasBuildTargets() const; virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions() const; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index e777e1018497f718d38724e8c7c90e5ab3ffc946..e5e1bc4656694552356de2792ed55b6485c58b2b 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -783,7 +783,7 @@ void Qt4ProFileNode::buildStateChanged(ProjectExplorer::Project *project) } } -bool Qt4ProFileNode::hasTargets() const +bool Qt4ProFileNode::hasBuildTargets() const { return (projectType() == ApplicationTemplate) || (projectType() == LibraryTemplate); } diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index d26787faedfd5493ceaba526a3b98752492ea42f..0f7cf2fb0b5b5cfbefec35ae888ae27623b20c94 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -140,7 +140,7 @@ public: // ProjectNode interface QList<ProjectAction> supportedActions() const; - bool hasTargets() const { return false; } + bool hasBuildTargets() const { return false; } bool addSubProjects(const QStringList &proFilePaths); bool removeSubProjects(const QStringList &proFilePaths); @@ -203,7 +203,7 @@ public: QObject *parent = 0); ~Qt4ProFileNode(); - bool hasTargets() const; + bool hasBuildTargets() const; Qt4ProjectType projectType() const;