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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
This commit is contained in:
Eike Ziller
2017-04-19 09:56:14 +02:00
parent 8b6eb5aabb 01b2ed7904
commit 88897f3a87
232 changed files with 3919 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -126,9 +126,13 @@ public:
bool showInSimpleTree() const override { return true; }
QList<ProjectExplorer::ProjectAction> supportedActions(Node *) const override
bool supportsAction(ProjectAction action, Node *) const override
{
return {AddNewFile, AddExistingFile, AddExistingDirectory, RemoveFile, Rename};
return action == AddNewFile
|| action == AddExistingFile
|| action == AddExistingDirectory
|| action == RemoveFile
|| action == Rename;
}
bool addFiles(const QStringList &filePaths, QStringList * = 0) override
@@ -164,6 +168,7 @@ GenericProject::GenericProject(const Utils::FileName &fileName) :
setId(Constants::GENERICPROJECT_ID);
setProjectContext(Context(GenericProjectManager::Constants::PROJECTCONTEXT));
setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
setDisplayName(fileName.toFileInfo().completeBaseName());
const QFileInfo fileInfo = projectFilePath().toFileInfo();
const QDir dir = fileInfo.dir();
@@ -467,11 +472,6 @@ void GenericProject::activeBuildConfigurationWasChanged()
refresh(Everything);
}
QString GenericProject::displayName() const
{
return projectFilePath().toFileInfo().completeBaseName();
}
QStringList GenericProject::buildTargets() const
{
const QStringList targets = { "all", "clean" };