STL compatibility: use push_back() instead of operator<<

...and operator+=

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

30 files changed, 103 insertions, 98 deletions

diff --git a/src/app/qbs-create-project/createproject.cpp b/src/app/qbs-create-project/createproject.cpp
index 850eacb2e..26147b484 100644
--- a/src/app/qbs-create-project/createproject.cpp
+++ b/src/app/qbs-create-project/createproject.cpp
@@ -62,9 +62,9 @@ void ProjectCreator::run(const QString &topLevelDir, ProjectStructure projectStr
 {
     m_projectStructure = projectStructure;
     for (const QString &s : whiteList)
-        m_whiteList << QRegExp(s, Qt::CaseSensitive, QRegExp::Wildcard);
+        m_whiteList.push_back(QRegExp(s, Qt::CaseSensitive, QRegExp::Wildcard));
     for (const QString &s : blackList)
-        m_blackList << QRegExp(s, Qt::CaseSensitive, QRegExp::Wildcard);
+        m_blackList.push_back(QRegExp(s, Qt::CaseSensitive, QRegExp::Wildcard));
     m_topLevelProject.dirPath = topLevelDir;
     setupProject(&m_topLevelProject);
     serializeProject(m_topLevelProject);
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 760568527..a18fe61e0 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -90,7 +90,7 @@ static void addMSVCPlatform(Settings *settings, QList<Profile> &profiles, QStrin
     p.setValue(QLatin1String("qbs.toolchain"), QStringList(QLatin1String("msvc")));
     p.setValue(QLatin1String("cpp.toolchainInstallPath"), msvc->binPath);
     setQtHelperProperties(p, msvc);
-    profiles << p;
+    profiles.push_back(p);
 }
 
 struct MSVCArchInfo
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 2738572e7..b8f987365 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -247,7 +247,7 @@ static void gccProbe(Settings *settings, QList<Profile> &profiles, const QString
     }
     const QString profileName = cfi.completeBaseName();
     const QStringList toolchainTypes = toolchainTypeFromCompilerName(compilerName);
-    profiles << createGccProfile(compilerFilePath, settings, toolchainTypes, profileName);
+    profiles.push_back(createGccProfile(compilerFilePath, settings, toolchainTypes, profileName));
 }
 
 static void mingwProbe(Settings *settings, QList<Profile> &profiles)
@@ -266,8 +266,8 @@ static void mingwProbe(Settings *settings, QList<Profile> &profiles)
         const QString gccPath
                 = findExecutable(HostOsInfo::appendExecutableSuffix(compilerName));
         if (!gccPath.isEmpty())
-            profiles << createGccProfile(gccPath, settings,
-                                         canonicalToolchain(QLatin1String("mingw")));
+            profiles.push_back(createGccProfile(gccPath, settings,
+                                                canonicalToolchain(QLatin1String("mingw"))));
     }
 }
 
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index 18b072e30..ce82dd5cf 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -182,7 +182,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x
                                  << QLatin1String("gcc"));
     if (devPath != defaultDeveloperPath)
         installationProfile.setValue(QStringLiteral("xcode.developerPath"), devPath);
-    profiles << installationProfile;
+    profiles.push_back(installationProfile);
 
     QStringList platforms;
     platforms << QStringLiteral("macosx")
@@ -197,7 +197,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x
         platformProfile.removeProfile();
         platformProfile.setBaseProfile(installationProfile.name());
         platformProfile.setValue(QStringLiteral("qbs.targetOS"), targetOSList(platform));
-        profiles << platformProfile;
+        profiles.push_back(platformProfile);
 
         for (const QString &arch : archList(platform)) {
             Profile archProfile(xcodeName + QLatin1Char('-') + platform + QLatin1Char('-') + arch,
@@ -206,7 +206,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x
             archProfile.setBaseProfile(platformProfile.name());
             archProfile.setValue(QStringLiteral("qbs.architecture"),
                                  qbs::canonicalArchitecture(arch));
-            profiles << archProfile;
+            profiles.push_back(archProfile);
         }
     }
 }
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index 87e86f37a..d5a8bbd55 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -178,7 +178,7 @@ void CommandLineFrontend::start()
             SetupProjectJob * const job = Project().setupProject(params,
                     ConsoleLogger::instance().logSink(), this);
             connectJob(job);
-            m_resolveJobs << job;
+            m_resolveJobs.push_back(job);
         }
 
         /*
@@ -230,7 +230,7 @@ void CommandLineFrontend::handleJobFinished(bool success, AbstractJob *job)
             cancel();
         } else if (SetupProjectJob * const setupJob = qobject_cast<SetupProjectJob *>(job)) {
             m_resolveJobs.removeOne(job);
-            m_projects << setupJob->project();
+            m_projects.push_back(setupJob->project());
             if (m_observer && resolvingMultipleProjects())
                 m_observer->incrementProgressValue();
             if (m_resolveJobs.empty())
@@ -345,7 +345,7 @@ CommandLineFrontend::ProductMap CommandLineFrontend::productsToUse() const
         const ProjectData projectData = project.projectData();
         foreach (const ProductData &product, projectData.allProducts()) {
             if (useAll || m_parser.products().contains(product.name())) {
-                productList << product;
+                productList.push_back(product);
                 productNames << product.name();
             }
         }
@@ -416,9 +416,10 @@ void CommandLineFrontend::makeClean()
     } else {
         const ProductMap &products = productsToUse();
         for (ProductMap::ConstIterator it = products.begin(); it != products.end(); ++it) {
-            m_buildJobs << it.key().cleanSomeProducts(it.value(),
-                                                      m_parser.cleanOptions(it.key().profile()),
-                                                      this);
+            m_buildJobs.push_back(it.key().cleanSomeProducts(
+                                      it.value(),
+                                      m_parser.cleanOptions(it.key().profile()),
+                                      this));
         }
     }
     connectBuildJobs();
@@ -486,7 +487,8 @@ void CommandLineFrontend::build()
     } else {
         const ProductMap &products = productsToUse();
         for (ProductMap::ConstIterator it = products.begin(); it != products.end(); ++it)
-            m_buildJobs << it.key().buildSomeProducts(it.value(), buildOptions(it.key()), this);
+            m_buildJobs.push_back(it.key().buildSomeProducts(it.value(),
+                                                             buildOptions(it.key()), this));
     }
     connectBuildJobs();
 
@@ -626,7 +628,7 @@ ProductData CommandLineFrontend::getTheOneRunnableProduct()
     QList<ProductData> runnableProducts;
     foreach (const ProductData &p, m_projects.front().projectData().allProducts()) {
         if (p.isRunnable())
-            runnableProducts << p;
+            runnableProducts.push_back(p);
     }
 
     if (runnableProducts.size() == 1)
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index 427cf313a..2df1d8cce 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -474,18 +474,20 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildConfigurations()
         const QString key = arg.left(sepPos);
         const QString rawValue = arg.mid(sepPos + 1);
         if (key == QLatin1String("config") || key == configurationNameKey) {
-            propertiesPerConfiguration << std::make_pair(currentConfigurationName,
-                                                         currentProperties);
+            propertiesPerConfiguration.push_back(std::make_pair(currentConfigurationName,
+                                                                currentProperties));
             currentConfigurationName = rawValue;
             currentProperties.clear();
             continue;
         }
         currentProperties.insert(propertyName(key), representationToSettingsValue(rawValue));
     }
-    propertiesPerConfiguration << std::make_pair(currentConfigurationName, currentProperties);
+    propertiesPerConfiguration.push_back(std::make_pair(currentConfigurationName,
+                                                        currentProperties));
 
     if (propertiesPerConfiguration.size() == 1) // No configuration name specified on command line.
-        propertiesPerConfiguration << PropertyListItem(QStringLiteral("default"), QVariantMap());
+        propertiesPerConfiguration.push_back(PropertyListItem(QStringLiteral("default"),
+                                                              QVariantMap()));
 
     const QVariantMap globalProperties = propertiesPerConfiguration.takeFirst().second;
     QList<QVariantMap> buildConfigs;
@@ -505,7 +507,7 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildConfigurations()
         }
 
         properties.insert(configurationNameKey, configurationName);
-        buildConfigs << properties;
+        buildConfigs.push_back(properties);
     }
 
     buildConfigurations = buildConfigs;
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp
index aa9cf0f6d..3fbb1d885 100644
--- a/src/app/qbs/parser/parsercommand.cpp
+++ b/src/app/qbs/parser/parsercommand.cpp
@@ -95,7 +95,7 @@ QList<CommandLineOption::Type> Command::actualSupportedOptions() const
     if (!HostOsInfo::isAnyUnixHost())
         options.removeOne(CommandLineOption::ShowProgressOptionType);
     if (type() != HelpCommandType)
-        options << CommandLineOption::SettingsDirOptionType; // Valid for almost all commands.
+        options.push_back(CommandLineOption::SettingsDirOptionType); // Valid for almost all commands.
     return options;
 }
 
diff --git a/src/lib/corelib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp
index 4f0727a44..f5d60df80 100644
--- a/src/lib/corelib/api/changeset.cpp
+++ b/src/lib/corelib/api/changeset.cpp
@@ -145,7 +145,7 @@ bool ChangeSet::replace_helper(int pos, int length, const QString &replacement)
     cmd.pos1 = pos;
     cmd.length1 = length;
     cmd.text = replacement;
-    m_operationList += cmd;
+    m_operationList.push_back(cmd);
 
     return !m_error;
 }
@@ -161,7 +161,7 @@ bool ChangeSet::move_helper(int pos, int length, int to)
     cmd.pos1 = pos;
     cmd.length1 = length;
     cmd.pos2 = to;
-    m_operationList += cmd;
+    m_operationList.push_back(cmd);
 
     return !m_error;
 }
@@ -176,7 +176,7 @@ bool ChangeSet::insert(int pos, const QString &text)
     EditOp cmd(EditOp::Insert);
     cmd.pos1 = pos;
     cmd.text = text;
-    m_operationList += cmd;
+    m_operationList.push_back(cmd);
 
     return !m_error;
 }
@@ -219,7 +219,7 @@ bool ChangeSet::remove_helper(int pos, int length)
     EditOp cmd(EditOp::Remove);
     cmd.pos1 = pos;
     cmd.length1 = length;
-    m_operationList += cmd;
+    m_operationList.push_back(cmd);
 
     return !m_error;
 }
@@ -236,7 +236,7 @@ bool ChangeSet::flip_helper(int pos1, int length1, int pos2, int length2)
     cmd.length1 = length1;
     cmd.pos2 = pos2;
     cmd.length2 = length2;
-    m_operationList += cmd;
+    m_operationList.push_back(cmd);
 
     return !m_error;
 }
@@ -252,7 +252,7 @@ bool ChangeSet::copy_helper(int pos, int length, int to)
     cmd.pos1 = pos;
     cmd.length1 = length;
     cmd.pos2 = to;
-    m_operationList += cmd;
+    m_operationList.push_back(cmd);
 
     return !m_error;
 }
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 9b13f0609..e7f9962e1 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -134,7 +134,7 @@ static void addDependencies(QList<ResolvedProductPtr> &products)
         const ResolvedProductPtr &product = products.at(i);
         for (const ResolvedProductPtr &dependency : qAsConst(product->dependencies)) {
             if (!products.contains(dependency))
-                products << dependency;
+                products.push_back(dependency);
         }
     }
 }
@@ -179,7 +179,7 @@ QList<ResolvedProductPtr> ProjectPrivate::internalProducts(const QList<ProductDa
     QList<ResolvedProductPtr> internalProducts;
     for (const ProductData &product : products) {
         if (product.isEnabled())
-            internalProducts << internalProduct(product);
+            internalProducts.push_back(internalProduct(product));
     }
     return internalProducts;
 }
@@ -190,7 +190,7 @@ static QList<ResolvedProductPtr> enabledInternalProducts(const ResolvedProjectCo
     QList<ResolvedProductPtr> products;
     for (const ResolvedProductPtr &p : qAsConst(project->products)) {
         if (p->enabled && (includingNonDefault || p->builtByDefault()))
-            products << p;
+            products.push_back(p);
     }
     for (const ResolvedProjectConstPtr &subProject : qAsConst(project->subProjects))
         products << enabledInternalProducts(subProject, includingNonDefault);
@@ -246,7 +246,7 @@ QList<ProductData> ProjectPrivate::findProductsByName(const QString &name) const
     QList<ProductData> list;
     for (const ProductData &p : m_projectData.allProducts()) {
         if (p.name() == name)
-            list << p;
+            list.push_back(p);
     }
     return list;
 }
@@ -270,13 +270,13 @@ GroupData ProjectPrivate::createGroupDataFromGroup(const GroupPtr &resolvedGroup
     for (const SourceArtifactConstPtr &sa : qAsConst(resolvedGroup->files)) {
         ArtifactData artifact = createApiSourceArtifact(sa);
         setupInstallData(artifact, product);
-        group.d->sourceArtifacts << artifact;
+        group.d->sourceArtifacts.push_back(artifact);
     }
     if (resolvedGroup->wildcards) {
         for (const SourceArtifactConstPtr &sa : qAsConst(resolvedGroup->wildcards->files)) {
             ArtifactData artifact = createApiSourceArtifact(sa);
             setupInstallData(artifact, product);
-            group.d->sourceArtifactsFromWildcards << artifact;
+            group.d->sourceArtifactsFromWildcards.push_back(artifact);
         }
     }
     qSort(group.d->sourceArtifacts);
diff --git a/src/lib/corelib/buildgraph/artifactcleaner.cpp b/src/lib/corelib/buildgraph/artifactcleaner.cpp
index df6e7f8c0..cf1c52e10 100644
--- a/src/lib/corelib/buildgraph/artifactcleaner.cpp
+++ b/src/lib/corelib/buildgraph/artifactcleaner.cpp
@@ -187,7 +187,7 @@ void ArtifactCleaner::cleanup(const TopLevelProjectPtr &project,
         if (dir != project->buildDirectory) {
             const QString parentDir = QDir::cleanPath(dir + QLatin1String("/.."));
             if (parentDir != project->buildDirectory && !dirList.contains(parentDir))
-                dirList << parentDir;
+                dirList.push_back(parentDir);
         }
     }
     m_observer->incrementProgressValue();
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index 13b0312d3..cd0f5800a 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -566,7 +566,7 @@ bool BuildGraphLoader::hasProductFileChanged(const QList<ResolvedProductPtr> &re
             }
             if (foundMissingSourceFile) {
                 hasChanged = true;
-                changedProducts += product;
+                changedProducts.push_back(product);
                 continue;
             }
 
@@ -594,7 +594,7 @@ bool BuildGraphLoader::hasProductFileChanged(const QList<ResolvedProductPtr> &re
                 if (files == wcFiles)
                     continue;
                 hasChanged = true;
-                changedProducts += product;
+                changedProducts.push_back(product);
                 break;
             }
         }
diff --git a/src/lib/corelib/buildgraph/cycledetector.cpp b/src/lib/corelib/buildgraph/cycledetector.cpp
index b574a049d..13d1d85b9 100644
--- a/src/lib/corelib/buildgraph/cycledetector.cpp
+++ b/src/lib/corelib/buildgraph/cycledetector.cpp
@@ -101,7 +101,8 @@ QList<BuildGraphNode *> CycleDetector::cycle(BuildGraphNode *doubleEntry)
 {
     QList<BuildGraphNode *> path;
     findPath(doubleEntry, m_parent, path);
-    return path << doubleEntry;
+    path.push_back(doubleEntry);
+    return path;
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index d5cb56f24..04e719665 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -763,7 +763,7 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0)
             // TODO: Shouldn't addedByScanner always be true here? Otherwise the child would be
             //       in the list already, no?
             if (canRescue)
-                childrenToConnect << std::make_pair(child, cd.addedByScanner);
+                childrenToConnect.push_back({child, cd.addedByScanner});
         }
         for (const QString &depPath : rad.fileDependencies) {
             const QList<FileResourceBase *> depList = m_project->buildData->lookupFiles(depPath);
@@ -993,7 +993,7 @@ void Executor::checkForUnbuiltProducts()
         for (BuildGraphNode *rootNode : qAsConst(product->buildData->roots)) {
             if (rootNode->buildState != BuildGraphNode::Built) {
                 productBuilt = false;
-                unbuiltProducts += product;
+                unbuiltProducts.push_back(product);
                 break;
             }
         }
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index 75f7ff15e..78808b531 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -181,12 +181,12 @@ Set<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifac
             cache.valid = true;
             for (ScannerPlugin *scanner : ScannerPluginManager::scannersForFileTag(fileTag)) {
                 PluginDependencyScanner *pluginScanner = new PluginDependencyScanner(scanner);
-                cache.scanners += DependencyScannerPtr(pluginScanner);
+                cache.scanners.push_back(DependencyScannerPtr(pluginScanner));
             }
             for (const ResolvedScannerConstPtr &scanner : qAsConst(product->scanners)) {
                 if (scanner->inputs.contains(fileTag)) {
-                    cache.scanners += DependencyScannerPtr(
-                                new UserDependencyScanner(scanner, engine));
+                    cache.scanners.push_back(DependencyScannerPtr(
+                                new UserDependencyScanner(scanner, engine)));
                     break;
                 }
             }
diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp
index f95bc1600..03ae90759 100644
--- a/src/lib/corelib/buildgraph/productinstaller.cpp
+++ b/src/lib/corelib/buildgraph/productinstaller.cpp
@@ -99,7 +99,7 @@ void ProductInstaller::install()
         QBS_CHECK(product->buildData);
         for (const Artifact *artifact : filterByType<Artifact>(product->buildData->nodes)) {
             if (artifact->properties->qbsPropertyValue(QLatin1String("install")).toBool())
-                artifactsToInstall += artifact;
+                artifactsToInstall.push_back(artifact);
         }
     }
     m_observer->initialize(Tr::tr("Installing"), artifactsToInstall.size());
diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index dc6b9e551..67da0c1f5 100644
--- a/src/lib/corelib/buildgraph/rulecommands.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -445,7 +445,7 @@ QList<AbstractCommandPtr> loadCommandList(PersistentPool &pool)
         default:
             QBS_CHECK(false);
         }
-        commands += cmd;
+        commands.push_back(cmd);
     }
     return commands;
 }
diff --git a/src/lib/corelib/buildgraph/rulegraph.cpp b/src/lib/corelib/buildgraph/rulegraph.cpp
index 2aa9f6a77..e782b3f32 100644
--- a/src/lib/corelib/buildgraph/rulegraph.cpp
+++ b/src/lib/corelib/buildgraph/rulegraph.cpp
@@ -81,7 +81,7 @@ void RuleGraph::build(const QList<RulePtr> &rules, const FileTags &productFileTa
     QList<const Rule *> productRules;
     for (const FileTag &productFileTag : productFileTags) {
         QList<const Rule *> rules = m_outputFileTagToRule.value(productFileTag);
-        productRules += rules;
+        productRules << rules;
         //### check: the rule graph must be a in valid shape!
     }
     for (const Rule *r : qAsConst(productRules))
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index bd7e0379c..b21de08f5 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -195,8 +195,8 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p
                                                            &outputFilePaths);
             if (!outputArtifact)
                 continue;
-            outputArtifacts << outputArtifact;
-            ruleArtifactArtifactMap << std::make_pair(ruleArtifact.get(), outputArtifact);
+            outputArtifacts.push_back(outputArtifact);
+            ruleArtifactArtifactMap.push_back({ ruleArtifact.get(), outputArtifact });
         }
     }
 
@@ -418,7 +418,7 @@ QList<Artifact *> RulesApplicator::runOutputArtifactsScript(const ArtifactSet &i
     const quint32 c = res.property(QLatin1String("length")).toUInt32();
     for (quint32 i = 0; i < c; ++i) {
         try {
-            lst += createOutputArtifactFromScriptValue(res.property(i), inputArtifacts);
+            lst.push_back(createOutputArtifactFromScriptValue(res.property(i), inputArtifacts));
         } catch (const RuleOutputArtifactsException &roae) {
             ErrorInfo ei = roae;
             ei.prepend(Tr::tr("Error in Rule.outputArtifacts[%1]").arg(i),
diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp
index 13d84adaa..4e2bfd350 100644
--- a/src/lib/corelib/buildgraph/transformer.cpp
+++ b/src/lib/corelib/buildgraph/transformer.cpp
@@ -252,13 +252,13 @@ void Transformer::createCommands(ScriptEngine *engine, const ScriptFunctionConst
             if (item.isValid() && !item.isUndefined()) {
                 const AbstractCommandPtr cmd = createCommandFromScriptValue(item, script->location);
                 if (cmd)
-                    commands += cmd;
+                    commands.push_back(cmd);
             }
         }
     } else {
         const AbstractCommandPtr cmd = createCommandFromScriptValue(scriptValue, script->location);
         if (cmd)
-            commands += cmd;
+            commands.push_back(cmd);
     }
 }
 
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index c37cb8622..f6f3c1fd1 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -500,7 +500,7 @@ QList<SourceArtifactPtr> ResolvedProduct::allFiles() const
 {
     QList<SourceArtifactPtr> lst;
     for (const GroupConstPtr &group : qAsConst(groups))
-        lst += group->allFiles();
+        lst << group->allFiles();
     return lst;
 }
 
@@ -513,7 +513,7 @@ QList<SourceArtifactPtr> ResolvedProduct::allEnabledFiles() const
     QList<SourceArtifactPtr> lst;
     for (const GroupConstPtr &group : qAsConst(groups)) {
         if (group->enabled)
-            lst += group->allFiles();
+            lst << group->allFiles();
     }
     return lst;
 }
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 9c8e01543..879f42a11 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -419,7 +419,7 @@ void ProjectResolver::resolveProductFully(Item *item, ProjectContext *projectCon
 {
     const ResolvedProductPtr product = m_productContext->product;
     m_productItemMap.insert(product, item);
-    projectContext->project->products += product;
+    projectContext->project->products.push_back(product);
     product->name = m_evaluator->stringValue(item, QLatin1String("name"));
 
     // product->buildDirectory() isn't valid yet, because the productProperties map is not ready.
@@ -493,7 +493,7 @@ void ProjectResolver::resolveProductFully(Item *item, ProjectContext *projectCon
     resolveModules(item, projectContext);
 
     for (const FileTag &t : qAsConst(product->fileTags))
-        m_productsByType[t] << product;
+        m_productsByType[t].push_back(product);
 }
 
 void ProjectResolver::resolveModules(const Item *item, ProjectContext *projectContext)
@@ -528,7 +528,7 @@ void ProjectResolver::resolveModule(const QualifiedId &moduleName, Item *item, b
             module->moduleDependencies += m.name.toString();
     }
 
-    m_productContext->product->modules += module;
+    m_productContext->product->modules.push_back(module);
     if (!parameters.empty())
         m_productContext->product->moduleParameters[module] = parameters;
 
@@ -592,7 +592,7 @@ SourceArtifactPtr ProjectResolver::createSourceArtifact(const ResolvedProductPtr
     artifact->overrideFileTags = group->overrideTags;
     artifact->properties = group->properties;
     artifact->targetOfModule = group->targetOfModule;
-    (wildcard ? group->wildcards->files : group->files) += artifact;
+    (wildcard ? group->wildcards->files : group->files).push_back(artifact);
     return artifact;
 }
 
@@ -607,7 +607,7 @@ static QualifiedIdSet propertiesToEvaluate(const QList<QualifiedId> &initialProp
         if (!insertResult.second)
             continue;
         for (const QualifiedId &directDep : deps.value(prop))
-            remainingProps << directDep;
+            remainingProps.push_back(directDep);
     }
     return allProperties;
 }
@@ -720,7 +720,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont
         aprops->setFileTagsFilter(FileTags::fromStringList(fileTagsFilter));
         aprops->setExtraFileTags(fileTags);
         aprops->setPropertyMapInternal(moduleProperties);
-        m_productContext->product->artifactProperties += aprops;
+        m_productContext->product->artifactProperties.push_back(aprops);
         m_productContext->artifactPropertiesPerFilter.insert(fileTagsFilter,
                                 ProductContext::ArtifactPropertiesInfo(aprops, item->location()));
         return;
@@ -788,7 +788,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont
     group->name = m_evaluator->stringValue(item, QLatin1String("name"));
     if (group->name.isEmpty())
         group->name = Tr::tr("Group %1").arg(m_productContext->product->groups.size());
-    m_productContext->product->groups += group;
+    m_productContext->product->groups.push_back(group);
 
     class GroupContextSwitcher {
     public:
@@ -925,16 +925,16 @@ void ProjectResolver::resolveRule(Item *item, ProjectContext *projectContext)
     }
     if (m_productContext) {
         rule->product = m_productContext->product.get();
-        m_productContext->product->rules += rule;
+        m_productContext->product->rules.push_back(rule);
     } else {
-        projectContext->rules += rule;
+        projectContext->rules.push_back(rule);
     }
 }
 
 void ProjectResolver::resolveRuleArtifact(const RulePtr &rule, Item *item)
 {
     RuleArtifactPtr artifact = RuleArtifact::create();
-    rule->artifacts += artifact;
+    rule->artifacts.push_back(artifact);
     artifact->location = item->location();
 
     if (const auto sourceProperty = item->sourceProperty(QStringLiteral("filePath")))
@@ -1009,7 +1009,7 @@ void ProjectResolver::resolveFileTagger(Item *item, ProjectContext *projectConte
     }
 
     const int priority = m_evaluator->intValue(item, QLatin1String("priority"));
-    fileTaggers += FileTagger::create(patterns, fileTags, priority);
+    fileTaggers.push_back(FileTagger::create(patterns, fileTags, priority));
 }
 
 void ProjectResolver::resolveScanner(Item *item, ProjectResolver::ProjectContext *projectContext)
@@ -1026,7 +1026,7 @@ void ProjectResolver::resolveScanner(Item *item, ProjectResolver::ProjectContext
     scanner->recursive = m_evaluator->boolValue(item, QLatin1String("recursive"));
     scanner->searchPathsScript = scriptFunctionValue(item, QLatin1String("searchPaths"));
     scanner->scanScript = scriptFunctionValue(item, QLatin1String("scan"));
-    m_productContext->product->scanners += scanner;
+    m_productContext->product->scanners.push_back(scanner);
 }
 
 ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies(
@@ -1227,7 +1227,7 @@ void ProjectResolver::resolveProductDependencies(const ProjectContext &projectCo
 void ProjectResolver::postProcess(const ResolvedProductPtr &product,
                                   ProjectContext *projectContext) const
 {
-    product->fileTaggers += projectContext->fileTaggers;
+    product->fileTaggers << projectContext->fileTaggers;
     std::sort(std::begin(product->fileTaggers), std::end(product->fileTaggers),
               [] (const FileTaggerConstPtr &a, const FileTaggerConstPtr &b) {
         return a->priority() > b->priority();
@@ -1235,7 +1235,7 @@ void ProjectResolver::postProcess(const ResolvedProductPtr &product,
     for (const RulePtr &rule : qAsConst(projectContext->rules)) {
         RulePtr clonedRule = rule->clone();
         clonedRule->product = product.get();
-        product->rules += clonedRule;
+        product->rules.push_back(clonedRule);
     }
 }
 
@@ -1370,7 +1370,7 @@ ProjectResolver::ProjectContext ProjectResolver::createProjectContext(ProjectCon
     ProjectContext subProjectContext;
     subProjectContext.parentContext = parentProjectContext;
     subProjectContext.project = ResolvedProject::create();
-    parentProjectContext->project->subProjects += subProjectContext.project;
+    parentProjectContext->project->subProjects.push_back(subProjectContext.project);
     subProjectContext.project->parentProject = parentProjectContext->project;
     return subProjectContext;
 }
diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index 277e40427..3b27153e7 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -218,7 +218,7 @@ bool Logger::traceEnabled() const
 void Logger::printWarning(const ErrorInfo &warning)
 {
     if (m_storeWarnings)
-        m_warnings << warning;
+        m_warnings.push_back(warning);
     logSink()->printWarning(warning);
 }
 
diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index cc929cad4..eaa70ec36 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -65,7 +65,7 @@ void ScannerPluginManager::registerPlugins(ScannerPlugin **plugins)
         const FileTags &fileTags = FileTags::fromStringList(
                     QString::fromLatin1(plugins[i]->fileTags).split(QLatin1Char(',')));
         for (const FileTag &tag : fileTags)
-        m_scannerPlugins[tag] += plugins[i];
+        m_scannerPlugins[tag].push_back(plugins[i]);
     }
 }
 
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index b57ee0f39..4562de906 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -339,7 +339,7 @@ static Node *createNode(Node *parentNode, const QString &name)
     Node * const node = new Node;
     node->name = name;
     node->parent = parentNode;
-    parentNode->children << node;
+    parentNode->children.push_back(node);
     return node;
 }
 
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
index 904fdc82d..0258c7fc9 100644
--- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp
+++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
@@ -328,7 +328,7 @@ static void addTestModule(QList<QtModuleInfo> &modules)
     QtModuleInfo testModule(QLatin1String("QtTest"), QLatin1String("test"),
                                QStringList() << QLatin1String("testlib"));
     testModule.hasLibrary = false;
-    modules << testModule;
+    modules.push_back(testModule);
 }
 
 // See above.
@@ -338,7 +338,7 @@ static void addDesignerComponentsModule(QList<QtModuleInfo> &modules)
                         QLatin1String("designercomponents"),
                         QStringList() << QLatin1String("designercomponents-private"));
     module.hasLibrary = false;
-    modules << module;
+    modules.push_back(module);
 }
 
 
@@ -423,28 +423,28 @@ QList<QtModuleInfo> allQt4Modules(const QtEnvironment &qtEnvironment)
         axcontainer.modulePrefix = QLatin1String("Q");
         axcontainer.isStaticLibrary = true;
         axcontainer.includePaths << qtEnvironment.includePath + QLatin1String("/ActiveQt");
-        modules << axcontainer;
+        modules.push_back(axcontainer);
 
         QtModuleInfo axserver = axcontainer;
         axserver.name = QLatin1String("QAxServer");
         axserver.qbsName = QLatin1String("axserver");
         axserver.compilerDefines = QStringList() << QLatin1String("QAXSERVER");
-        modules << axserver;
+        modules.push_back(axserver);
     } else {
-        modules << QtModuleInfo(QLatin1String("QtDBus"), QLatin1String("dbus"))
-                << QtModuleInfo(QLatin1String("QtDBus"), QLatin1String("dbus-private"),
-                                QStringList() << QLatin1String("dbus"));
+        modules.push_back(QtModuleInfo(QLatin1String("QtDBus"), QLatin1String("dbus")));
+        modules.push_back(QtModuleInfo(QLatin1String("QtDBus"), QLatin1String("dbus-private"),
+                                       { QLatin1String("dbus") }));
     }
 
     QtModuleInfo designerComponentsPrivate(QLatin1String("QtDesignerComponents"),
             QLatin1String("designercomponents-private"),
             QStringList() << QLatin1String("gui-private") << QLatin1String("designer-private"));
     designerComponentsPrivate.hasLibrary = true;
-    modules << designerComponentsPrivate;
+    modules.push_back(designerComponentsPrivate);
 
     QtModuleInfo phonon(QLatin1String("Phonon"), QLatin1String("phonon"));
     phonon.includePaths = phonon.qt4ModuleIncludePaths(qtEnvironment);
-    modules << phonon;
+    modules.push_back(phonon);
 
     // Set up include paths that haven't been set up before this point.
     for (auto &module : modules) {
@@ -467,16 +467,16 @@ QList<QtModuleInfo> allQt4Modules(const QtEnvironment &qtEnvironment)
     virtualModule.hasLibrary = false;
     virtualModule.qbsName = QLatin1String("widgets");
     virtualModule.dependencies = QStringList() << QLatin1String("core") << QLatin1String("gui");
-    modules << virtualModule;
+    modules.push_back(virtualModule);
     virtualModule.qbsName = QLatin1String("quick");
     virtualModule.dependencies = QStringList() << QLatin1String("declarative");
-    modules << virtualModule;
+    modules.push_back(virtualModule);
     virtualModule.qbsName = QLatin1String("concurrent");
     virtualModule.dependencies = QStringList() << QLatin1String("core");
-    modules << virtualModule;
+    modules.push_back(virtualModule);
     virtualModule.qbsName = QLatin1String("printsupport");
     virtualModule.dependencies = QStringList() << QLatin1String("core") << QLatin1String("gui");
-    modules << virtualModule;
+    modules.push_back(virtualModule);
 
     addTestModule(modules);
     addDesignerComponentsModule(modules);
@@ -642,7 +642,7 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q
 
         moduleInfo.setupLibraries(qtEnvironment, &nonExistingPrlFiles);
 
-        modules << moduleInfo;
+        modules.push_back(moduleInfo);
         if (moduleInfo.qbsName == QLatin1String("testlib"))
             addTestModule(modules);
         if (moduleInfo.qbsName == QLatin1String("designercomponents-private"))
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index cf254fee4..cc2e11096 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -68,7 +68,7 @@ public:
 
     void doPrintWarning(const qbs::ErrorInfo &error) {
         qDebug("%s", qPrintable(error.toString()));
-        warnings << error;
+        warnings.push_back(error);
     }
     void doPrintMessage(qbs::LoggerLevel, const QString &message, const QString &) {
         output += message;
@@ -1693,9 +1693,9 @@ void TestApi::multiArch()
         QVERIFY2(p.profile() == hostProfile.name() || p.profile() == targetProfile.name(),
                  qPrintable(p.profile()));
         if (p.profile() == hostProfile.name())
-            hostProducts << p;
+            hostProducts.push_back(p);
         else
-            targetProducts << p;
+            targetProducts.push_back(p);
     }
     QCOMPARE(hostProducts.size(), 2);
     QCOMPARE(targetProducts.size(), 1);
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 0bfc5a5e1..426e309a0 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -3236,7 +3236,7 @@ void TestBlackbox::installPackage()
     foreach (const QByteArray &line, outputLines) {
         const QByteArray trimmedLine = line.trimmed();
         if (!trimmedLine.isEmpty())
-            cleanOutputLines << trimmedLine;
+            cleanOutputLines.push_back(trimmedLine);
     }
     QCOMPARE(cleanOutputLines.size(), 3);
     foreach (const QByteArray &line, cleanOutputLines) {
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 457523185..29a739b90 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -1292,7 +1292,7 @@ public:
         JSSourceValuePtr value = JSSourceValue::create();
         value->setFile(m_fileContext);
         QString *str = new QString(sourceCode);
-        m_strings += str;
+        m_strings.push_back(str);
         value->setSourceCode(QStringRef(str));
         return value;
     }
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index 4f2dcd6b4..f616aa2f0 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -318,7 +318,7 @@ void TestTools::testSettingsMigration_data()
 QString TestTools::setupSettingsDir1()
 {
     QTemporaryDir * const baseDir = new QTemporaryDir;
-    m_tmpDirs << baseDir;
+    m_tmpDirs.push_back(baseDir);
 
     const Version thisVersion = Version::fromString(QBS_VERSION);
     Version predecessor;
@@ -361,7 +361,7 @@ QString TestTools::setupSettingsDir1()
 QString TestTools::setupSettingsDir2()
 {
     QTemporaryDir * const baseDir = new QTemporaryDir;
-    m_tmpDirs << baseDir;
+    m_tmpDirs.push_back(baseDir);
     const QString settingsDir = baseDir->path();
     QSettings s(settingsDir + QLatin1String("/qbs.conf"),
                 HostOsInfo::isWindowsHost() ? QSettings::IniFormat : QSettings::NativeFormat);
@@ -377,7 +377,7 @@ QString TestTools::setupSettingsDir2()
 QString TestTools::setupSettingsDir3()
 {
     auto * const baseDir = new QTemporaryDir;
-    m_tmpDirs << baseDir;
+    m_tmpDirs.push_back(baseDir);
     return baseDir->path();
 }
 
diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp
index 5d218d2c7..399216226 100644
--- a/tests/benchmarker/valgrindrunner.cpp
+++ b/tests/benchmarker/valgrindrunner.cpp
@@ -58,11 +58,11 @@ void ValgrindRunner::run()
 {
     QList<QFuture<void>> futures;
     if (m_activities & ActivityResolving)
-        futures << QtConcurrent::run(this, &ValgrindRunner::traceResolving);
+        futures.push_back(QtConcurrent::run(this, &ValgrindRunner::traceResolving));
     if (m_activities & ActivityRuleExecution)
-        futures << QtConcurrent::run(this, &ValgrindRunner::traceRuleExecution);
+        futures.push_back(QtConcurrent::run(this, &ValgrindRunner::traceRuleExecution));
     if (m_activities & ActivityNullBuild)
-        futures << QtConcurrent::run(this, &ValgrindRunner::traceNullBuild);
+        futures.push_back(QtConcurrent::run(this, &ValgrindRunner::traceNullBuild));
     while (!futures.empty())
         futures.takeFirst().waitForFinished();
 }
@@ -154,7 +154,7 @@ QStringList ValgrindRunner::valgrindCommandLine(const QString &qbsCommand, const
 void ValgrindRunner::addToResults(const ValgrindResult &result)
 {
     std::lock_guard<std::mutex> locker(m_resultsMutex);
-    m_results << result;
+    m_results.push_back(result);
 }
 
 qint64 ValgrindRunner::runCallgrind(const QString &qbsCommand, const QString &buildDir,