From 6a58666f4403cdde1809784c1cc98668a4b02cfc Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 3 Jul 2019 18:34:30 +0200
Subject: More Utils::toSet/toList

... and unrelated cosmetic changes.

Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakeproject.cpp  | 2 +-
 src/plugins/cmakeprojectmanager/tealeafreader.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/cmakeprojectmanager')

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();
 
-- 
cgit v1.2.3