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/projectexplorer/projectmodels.cpp

Change-Id: I290cba328212cadd3c12909d1f2f3642d326a1ca
This commit is contained in:
Eike Ziller
2017-03-28 09:56:16 +02:00
parent 39e8b3e355 2ee7967750
commit 016767b2a6
139 changed files with 1057 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,9 +326,6 @@ void GenericProject::parseProject(RefreshOptions options)
// TODO: Possibly load some configuration from the project file
//QSettings projectInfo(m_fileName, QSettings::IniFormat);
}
if (options & Files)
emit fileListChanged();
}
void GenericProject::refresh(RefreshOptions options)
@@ -469,22 +466,11 @@ void GenericProject::activeBuildConfigurationWasChanged()
refresh(Everything);
}
QStringList GenericProject::files() const
{
return m_files;
}
QString GenericProject::displayName() const
{
return projectFilePath().toFileInfo().completeBaseName();
}
QStringList GenericProject::files(FilesMode fileMode) const
{
Q_UNUSED(fileMode);
return m_files;
}
QStringList GenericProject::buildTargets() const
{
const QStringList targets = { "all", "clean" };