Avoid more deprecation warnings

Change-Id: Icc7bb7a4ccf7fc9f89f6f668c194ccd440e5231c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/autotest/testcodeparser.cpp

@@ -110,7 +110,7 @@ void TestCodeParser::setState(State state)
             m_partialUpdatePostponed = false;
             qCDebug(LOG) << "calling scanForTests with postponed files (setState)";
             if (!m_reparseTimer.isActive())
-                scanForTests(m_postponedFiles.toList());
+                scanForTests(Utils::toList(m_postponedFiles));
         }
     }
 }
@@ -469,7 +469,7 @@ void TestCodeParser::onPartialParsingFinished()
         m_partialUpdatePostponed = false;
         qCDebug(LOG) << "calling scanForTests with postponed files (onPartialParsingFinished)";
         if (!m_reparseTimer.isActive())
-            scanForTests(m_postponedFiles.toList());
+            scanForTests(Utils::toList(m_postponedFiles));
     } else {
         m_dirty |= m_codeModelParsing;
         if (m_dirty) {

src/plugins/clangformat/clangformatutils.cpp

@@ -197,13 +197,13 @@ static QString configForFile(Utils::FilePath fileName, bool checkForSettings)
 {
     QDir overrideDir;
     if (!checkForSettings || useProjectOverriddenSettings()) {
-        overrideDir = projectPath().toString();
+        overrideDir.setPath(projectPath().toString());
         if (!overrideDir.isEmpty() && overrideDir.exists(Constants::SETTINGS_FILE_NAME))
             return overrideDir.filePath(Constants::SETTINGS_FILE_NAME);
     }
 
     if (!checkForSettings || useGlobalOverriddenSettings()) {
-        overrideDir = globalPath().toString();
+        overrideDir.setPath(globalPath().toString());
         if (!overrideDir.isEmpty() && overrideDir.exists(Constants::SETTINGS_FILE_NAME))
             return overrideDir.filePath(Constants::SETTINGS_FILE_NAME);
     }

src/plugins/cmakeprojectmanager/tealeafreader.cpp

@@ -299,7 +299,7 @@ void TeaLeafReader::generateProjectTree(CMakeProjectNode *root, const QList<cons
         });
         allIncludePathSet.unite(Utils::toSet(targetIncludePaths));
     }
-    const QList<FilePath> allIncludePaths = allIncludePathSet.toList();
+    const QList<FilePath> allIncludePaths = Utils::toList(allIncludePathSet);
 
     const QList<const FileNode *> missingHeaders
             = Utils::filtered(allFiles, [&allIncludePaths](const FileNode *fn) -> bool {

src/plugins/debugger/qml/qmlengine.cpp

@@ -320,7 +320,7 @@ QmlEngine::~QmlEngine()
         if (textEditPtr)
             documentsToClose << textEditPtr.data()->document();
     }
-    EditorManager::closeDocuments(documentsToClose.toList());
+    EditorManager::closeDocuments(Utils::toList(documentsToClose));
 
     delete d;
 }

src/plugins/genericprojectmanager/genericproject.cpp

@@ -289,7 +289,7 @@ bool GenericProject::addFiles(const QStringList &filePaths)
     for (const QString &filePath : filePaths)
         insertSorted(&newList, baseDir.relativeFilePath(filePath));
 
-    const QSet<QString> includes = m_projectIncludePaths.toSet();
+    const QSet<QString> includes = Utils::toSet(m_projectIncludePaths);
     QSet<QString> toAdd;
 
     for (const QString &filePath : filePaths) {

src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp

@@ -29,6 +29,7 @@
 #include <coreplugin/generatedfile.h>
 #include <cpptools/abstracteditorsupport.h>
 
+#include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/macroexpander.h>
 #include <utils/templateengine.h>
@@ -293,8 +294,8 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
     sm.insert(QLatin1String("PLUGIN_HEADERS"), pluginHeaders);
     sm.insert(QLatin1String("PLUGIN_SOURCES"), pluginSources);
     sm.insert(QLatin1String("PLUGIN_RESOURCES"), options.resourceFile);
-    sm.insert(QLatin1String("WIDGET_LIBS"), QStringList(widgetLibraries.toList()).join(blank));
+    sm.insert(QLatin1String("WIDGET_LIBS"), QStringList(Utils::toList(widgetLibraries)).join(blank));
-    sm.insert(QLatin1String("INCLUSIONS"), QStringList(widgetProjects.toList()).join(QLatin1Char('\n')));
+    sm.insert(QLatin1String("INCLUSIONS"), QStringList(Utils::toList(widgetProjects)).join(QLatin1Char('\n')));
     const QString proFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_plugin.pro"), sm, errorMessage);
     if (proFileContents.isEmpty())
         return QList<Core::GeneratedFile>();

src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp

@@ -1637,7 +1637,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
                 });
         }
         const QStringList directoriesToAdd = Utils::filtered<QStringList>(
-            result->directoriesWithWildcards.toList(),
+            Utils::toList(result->directoriesWithWildcards),
             [this](const QString &path) {
                 return !m_wildcardWatcher->watchesDirectory(path);
             });

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -826,7 +826,7 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qmake
         // we add the recursive directories we find
         QSet<QString> tmp = recursiveDirs(folder);
         if (!tmp.isEmpty())
-            m_watcher.addPaths(tmp.toList());
+            m_watcher.addPaths(Utils::toList(tmp));
         m_recursiveWatchedFolders += tmp;
     }
 }
@@ -922,7 +922,7 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
     // If a subdirectory was added, watch it too
     QSet<QString> tmp = recursiveDirs(folderWithSlash);
     if (!tmp.isEmpty()) {
-        QSet<QString> alreadyAdded = m_watcher.directories().toSet();
+        QSet<QString> alreadyAdded = Utils::toSet(m_watcher.directories());
         tmp.subtract(alreadyAdded);
         if (!tmp.isEmpty())
             m_watcher.addPaths(Utils::toList(tmp));