aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager
diff options
context:
space:
mode:
authorhjk <[email protected]>2019-07-03 18:34:30 +0200
committerhjk <[email protected]>2019-07-04 12:28:38 +0000
commit6a58666f4403cdde1809784c1cc98668a4b02cfc (patch)
treeaf2ab09f192f779947a71022a91fb090bbfd5353 /src/plugins/cmakeprojectmanager
parent599b03179e392b97023c6ebca98faa514967841a (diff)
More Utils::toSet/toList
... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeproject.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/tealeafreader.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index a3e7ca3c37d..a1764e18d1e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -294,7 +294,7 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
{
CMakeConfigItem paths;
paths.key = "ANDROID_SO_LIBS_PATHS";
- paths.values = res.toList();
+ paths.values = Utils::toList(res);
patchedConfig.append(paths);
}
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.cpp b/src/plugins/cmakeprojectmanager/tealeafreader.cpp
index d336d9e8cfa..89b0e36d16f 100644
--- a/src/plugins/cmakeprojectmanager/tealeafreader.cpp
+++ b/src/plugins/cmakeprojectmanager/tealeafreader.cpp
@@ -297,7 +297,7 @@ void TeaLeafReader::generateProjectTree(CMakeProjectNode *root, const QList<cons
= Utils::filtered(bt.includeFiles, [this](const Utils::FilePath &fn) {
return fn.isChildOf(m_parameters.sourceDirectory);
});
- allIncludePathSet.unite(QSet<FilePath>::fromList(targetIncludePaths));
+ allIncludePathSet.unite(Utils::toSet(targetIncludePaths));
}
const QList<FilePath> allIncludePaths = allIncludePathSet.toList();