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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0
This commit is contained in:
Eike Ziller
2017-02-20 15:20:14 +01:00
parent 6ba90cd06a 7ee75bf4c2
commit dbb2288f1a
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -201,8 +201,21 @@ static void collectFilesForProject(const qbs::ProjectData &project, Project::Fil
}
if (mode & Project::GeneratedFiles) {
foreach (const qbs::ProductData &prd, project.products()) {
foreach (const qbs::ArtifactData &artifact, prd.generatedArtifacts())
result.insert(artifact.filePath());
foreach (const qbs::ArtifactData &artifact, prd.generatedArtifacts()) {
// A list of human-readable file types that we can reasonably expect
// to get generated during a build. Extend as needed.
static const QSet<QString> sourceTags = {
QLatin1String("c"), QLatin1String("cpp"), QLatin1String("hpp"),
QLatin1String("objc"), QLatin1String("objcpp"),
QLatin1String("c_pch_src"), QLatin1String("cpp_pch_src"),
QLatin1String("objc_pch_src"), QLatin1String("objcpp_pch_src"),
QLatin1String("asm"), QLatin1String("asm_cpp"),
QLatin1String("linkerscript"),
QLatin1String("qrc"), QLatin1String("java.java")
};
if (artifact.fileTags().toSet().intersects(sourceTags))
result.insert(artifact.filePath());
}
}
}
}