From d3b770c398d2c17cdae94e3d9d9093abf55f123b Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 26 Jul 2019 17:11:22 +0200 Subject: [PATCH] Qbs: Three more cases for Utils::to{Set,List} Change-Id: I6a400b06ad26c8ee92f13c6bd8b6b0c9e317f897 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp | 4 ++-- src/plugins/qbsprojectmanager/qbsproject.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index f7f143b0253..f7bbde2a138 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -82,7 +82,7 @@ void setupArtifacts(FolderNode *root, const QList &artifacts) }; auto node = std::make_unique(path, type); 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->compress(); @@ -194,7 +194,7 @@ QStringList unreferencedBuildSystemFiles(const qbs::Project &p) return result; const std::set &available = p.buildSystemFiles(); - QList referenced = referencedBuildSystemFiles(p.projectData()).toList(); + QList referenced = Utils::toList(referencedBuildSystemFiles(p.projectData())); Utils::sort(referenced); std::set_difference(available.begin(), available.end(), referenced.begin(), referenced.end(), std::back_inserter(result)); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 3d658ce8f7f..8aa7480cf96 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -1076,7 +1076,7 @@ void QbsProject::updateCppCodeModel() << grp.name() << "in product" << prd.name(); qCWarning(qbsPmLog) << "Expect problems with code model"; } - rpp.setPreCompiledHeaders(pchFiles.toList()); + rpp.setPreCompiledHeaders(Utils::toList(pchFiles)); rpp.setFiles(grp.allFilePaths(), [filePathToSourceArtifact](const QString &filePath) { // Keep this lambda thread-safe! return CppTools::ProjectFile(filePath,