Replace QList<qbs::Profile> with std::vector<qbs::Profile>

First, QList is not very good with qbs::Profile since
sizeof(qbs::Profile) > sizeof(void*)

Second, there's a common pattern to move value when appending to a list:
profiles.push_back(std::move(profile)), but it doesn't work with QList
since it doesn't have push_back(T&&) overload

Change-Id: Idc288390d8a89687ba5fe8be678d4fbd803c4249
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

15 files changed, 22 insertions, 20 deletions

diff --git a/src/app/qbs-setup-toolchains/clangclprobe.cpp b/src/app/qbs-setup-toolchains/clangclprobe.cpp
index 816d28546..4cb38b774 100644
--- a/src/app/qbs-setup-toolchains/clangclprobe.cpp
+++ b/src/app/qbs-setup-toolchains/clangclprobe.cpp
@@ -180,7 +180,7 @@ void createClangClProfile(const QFileInfo &compiler, Settings *settings,
   \brief Creates a clang-cl profile based on auto-detected vsversion.
   \internal
 */
-void clangClProbe(Settings *settings, QList<Profile> &profiles)
+void clangClProbe(Settings *settings, std::vector<Profile> &profiles)
 {
     const auto compilerName = QStringLiteral("clang-cl");
     qbsInfo() << Tr::tr("Trying to detect %1...").arg(compilerName);
diff --git a/src/app/qbs-setup-toolchains/clangclprobe.h b/src/app/qbs-setup-toolchains/clangclprobe.h
index 1afbbb1b8..2de1c0a64 100644
--- a/src/app/qbs-setup-toolchains/clangclprobe.h
+++ b/src/app/qbs-setup-toolchains/clangclprobe.h
@@ -40,7 +40,9 @@
 #ifndef QBS_SETUPTOOLCHAINS_CLANGCLPROBE_H
 #define QBS_SETUPTOOLCHAINS_CLANGCLPROBE_H
 
-#include <QtCore/qlist.h>
+#include <QString>
+
+#include <vector>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;
@@ -54,6 +56,6 @@ class Settings;
 void createClangClProfile(const QFileInfo &compiler, qbs::Settings *settings,
                           const QString &profileName);
 
-void clangClProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void clangClProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp
index 78439cbcb..1e0f9c142 100644
--- a/src/app/qbs-setup-toolchains/gccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/gccprobe.cpp
@@ -520,7 +520,7 @@ Profile createGccProfile(const QFileInfo &compiler, Settings *settings,
     return profile;
 }
 
-void gccProbe(Settings *settings, QList<Profile> &profiles, const QString &compilerName)
+void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString &compilerName)
 {
     qbsInfo() << Tr::tr("Trying to detect %1...").arg(compilerName);
 
diff --git a/src/app/qbs-setup-toolchains/gccprobe.h b/src/app/qbs-setup-toolchains/gccprobe.h
index 4344c5836..ae389dafc 100644
--- a/src/app/qbs-setup-toolchains/gccprobe.h
+++ b/src/app/qbs-setup-toolchains/gccprobe.h
@@ -56,7 +56,7 @@ qbs::Profile createGccProfile(const QFileInfo &compiler,
                               const QStringList &toolchainTypes,
                               const QString &profileName = QString());
 
-void gccProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles,
+void gccProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles,
               const QString &compilerName);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp
index 26ee57da9..7f710532a 100644
--- a/src/app/qbs-setup-toolchains/iarewprobe.cpp
+++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp
@@ -248,7 +248,7 @@ void createIarProfile(const QFileInfo &compiler, Settings *settings,
     createIarProfileHelper(info, settings, profileName);
 }
 
-void iarProbe(Settings *settings, QList<Profile> &profiles)
+void iarProbe(Settings *settings, std::vector<Profile> &profiles)
 {
     qbsInfo() << Tr::tr("Trying to detect IAR toolchains...");
 
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.h b/src/app/qbs-setup-toolchains/iarewprobe.h
index b604d6c6b..a1a51daa4 100644
--- a/src/app/qbs-setup-toolchains/iarewprobe.h
+++ b/src/app/qbs-setup-toolchains/iarewprobe.h
@@ -56,6 +56,6 @@ bool isIarCompiler(const QString &compilerName);
 void createIarProfile(const QFileInfo &compiler, qbs::Settings *settings,
                       QString profileName);
 
-void iarProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void iarProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/keilprobe.cpp b/src/app/qbs-setup-toolchains/keilprobe.cpp
index 08f0f2167..728c5b3f2 100644
--- a/src/app/qbs-setup-toolchains/keilprobe.cpp
+++ b/src/app/qbs-setup-toolchains/keilprobe.cpp
@@ -258,7 +258,7 @@ void createKeilProfile(const QFileInfo &compiler, Settings *settings,
     createKeilProfileHelper(info, settings, profileName);
 }
 
-void keilProbe(Settings *settings, QList<Profile> &profiles)
+void keilProbe(Settings *settings, std::vector<Profile> &profiles)
 {
     qbsInfo() << Tr::tr("Trying to detect KEIL toolchains...");
 
diff --git a/src/app/qbs-setup-toolchains/keilprobe.h b/src/app/qbs-setup-toolchains/keilprobe.h
index c7e66ee24..fec650ab0 100644
--- a/src/app/qbs-setup-toolchains/keilprobe.h
+++ b/src/app/qbs-setup-toolchains/keilprobe.h
@@ -56,6 +56,6 @@ bool isKeilCompiler(const QString &compilerName);
 void createKeilProfile(const QFileInfo &compiler, qbs::Settings *settings,
                        QString profileName);
 
-void keilProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void keilProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index c8108bfd2..9f2faaa99 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -87,7 +87,7 @@ static void setQtHelperProperties(Profile &p, const MSVC *msvc)
     p.setValue(QStringLiteral("cpp.compilerVersion"), msvc->compilerVersion.toString());
 }
 
-static void addMSVCPlatform(Settings *settings, QList<Profile> &profiles, QString name, MSVC *msvc)
+static void addMSVCPlatform(Settings *settings, std::vector<Profile> &profiles, QString name, MSVC *msvc)
 {
     qbsInfo() << Tr::tr("Setting up profile '%1'.").arg(name);
     Profile p(name, settings);
@@ -356,7 +356,7 @@ static std::vector<MSVC> installedCompilers()
     return msvcs;
 }
 
-void msvcProbe(Settings *settings, QList<Profile> &profiles)
+void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
 {
     qbsInfo() << Tr::tr("Detecting MSVC toolchains...");
 
@@ -470,7 +470,7 @@ void createMsvcProfile(const QFileInfo &compiler, Settings *settings,
     const auto compilerFilePath = compiler.absoluteFilePath();
     MSVC msvc(compilerFilePath, MSVC::architectureFromClPath(compilerFilePath));
     msvc.init();
-    QList<Profile> dummy;
+    std::vector<Profile> dummy;
     addMSVCPlatform(settings, dummy, profileName, &msvc);
     qbsInfo() << Tr::tr("Profile '%1' created for '%2'.")
                  .arg(profileName, QDir::toNativeSeparators(compilerFilePath));
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.h b/src/app/qbs-setup-toolchains/msvcprobe.h
index f63dd5dc8..3120a96f2 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.h
+++ b/src/app/qbs-setup-toolchains/msvcprobe.h
@@ -66,6 +66,6 @@ std::vector<MSVCInstallInfo> installedMSVCs();
 void createMsvcProfile(const QFileInfo &compiler, qbs::Settings *settings,
                        const QString &profileName);
 
-void msvcProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void msvcProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 205306acd..513008fd3 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -121,7 +121,7 @@ QStringList toolchainTypeFromCompilerName(const QString &compilerName)
 
 void probe(Settings *settings)
 {
-    QList<Profile> profiles;
+    std::vector<Profile> profiles;
     if (HostOsInfo::isWindowsHost()) {
         msvcProbe(settings, profiles);
         clangClProbe(settings, profiles);
diff --git a/src/app/qbs-setup-toolchains/sdccprobe.cpp b/src/app/qbs-setup-toolchains/sdccprobe.cpp
index eccd3ccae..3899ac3c9 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/sdccprobe.cpp
@@ -258,7 +258,7 @@ void createSdccProfile(const QFileInfo &compiler, Settings *settings,
     createSdccProfileHelper(info, settings, profileName);
 }
 
-void sdccProbe(Settings *settings, QList<Profile> &profiles)
+void sdccProbe(Settings *settings, std::vector<Profile> &profiles)
 {
     qbsInfo() << Tr::tr("Trying to detect SDCC toolchains...");
 
diff --git a/src/app/qbs-setup-toolchains/sdccprobe.h b/src/app/qbs-setup-toolchains/sdccprobe.h
index aa2c613f3..3d26583d9 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.h
+++ b/src/app/qbs-setup-toolchains/sdccprobe.h
@@ -70,6 +70,6 @@ bool isSdccCompiler(const QString &compilerName);
 void createSdccProfile(const QFileInfo &compiler, qbs::Settings *settings,
                        QString profileName);
 
-void sdccProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void sdccProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index a0f6f80d1..3ac243028 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -110,7 +110,7 @@ namespace {
 class XcodeProbe
 {
 public:
-    XcodeProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles)
+    XcodeProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles)
         : settings(settings), profiles(profiles)
     { }
 
@@ -120,7 +120,7 @@ public:
     void detectAll();
 private:
     qbs::Settings *settings;
-    QList<qbs::Profile> &profiles;
+    std::vector<qbs::Profile> &profiles;
     QStringList developerPaths;
 };
 
@@ -229,7 +229,7 @@ void XcodeProbe::detectAll()
 }
 } // end anonymous namespace
 
-void xcodeProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles)
+void xcodeProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles)
 {
     XcodeProbe probe(settings, profiles);
     probe.detectAll();
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.h b/src/app/qbs-setup-toolchains/xcodeprobe.h
index ab501036b..fc15d177e 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.h
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.h
@@ -47,6 +47,6 @@ class Profile;
 class Settings;
 }
 
-void xcodeProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void xcodeProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
 #endif // Header guard