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

Qbs: Three more cases for Utils::to{Set,List}

Browse Source 
Change-Id: I6a400b06ad26c8ee92f13c6bd8b6b0c9e317f897
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-07-26 17:11:22 +02:00
parent 01e482f96c
commit d3b770c398
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
View File

@@ -82,7 +82,7 @@ void setupArtifacts(FolderNode *root, const QList<qbs::ArtifactData> &artifacts)
}; };
auto node = std::make_unique<FileNode>(path, type); auto node = std::make_unique<FileNode>(path, type);
node->setIsGenerated(isGenerated); node->setIsGenerated(isGenerated);
node->setListInProject(!isGenerated || ad.fileTags().toSet().intersects(sourceTags)); node->setListInProject(!isGenerated || Utils::toSet(ad.fileTags()).intersects(sourceTags));
root->addNestedNode(std::move(node)); root->addNestedNode(std::move(node));
} }
root->compress(); root->compress();
@@ -194,7 +194,7 @@ QStringList unreferencedBuildSystemFiles(const qbs::Project &p)
return result; return result;
const std::set<QString> &available = p.buildSystemFiles(); const std::set<QString> &available = p.buildSystemFiles();
QList<QString> referenced = referencedBuildSystemFiles(p.projectData()).toList(); QList<QString> referenced = Utils::toList(referencedBuildSystemFiles(p.projectData()));
Utils::sort(referenced); Utils::sort(referenced);
std::set_difference(available.begin(), available.end(), referenced.begin(), referenced.end(), std::set_difference(available.begin(), available.end(), referenced.begin(), referenced.end(),
std::back_inserter(result)); std::back_inserter(result));

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

@@ -1076,7 +1076,7 @@ void QbsProject::updateCppCodeModel()
<< grp.name() << "in product" << prd.name(); << grp.name() << "in product" << prd.name();
qCWarning(qbsPmLog) << "Expect problems with code model"; qCWarning(qbsPmLog) << "Expect problems with code model";
} }
rpp.setPreCompiledHeaders(pchFiles.toList()); rpp.setPreCompiledHeaders(Utils::toList(pchFiles));
rpp.setFiles(grp.allFilePaths(), [filePathToSourceArtifact](const QString &filePath) { rpp.setFiles(grp.allFilePaths(), [filePathToSourceArtifact](const QString &filePath) {
// Keep this lambda thread-safe! // Keep this lambda thread-safe!
return CppTools::ProjectFile(filePath, return CppTools::ProjectFile(filePath,