aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/corelib/buildgraph/buildgraphloader.cpp2
-rw-r--r--src/lib/corelib/language/language.h4
-rw-r--r--src/lib/corelib/language/loader.cpp4
-rw-r--r--src/lib/corelib/language/loader.h8
-rw-r--r--src/lib/corelib/language/moduleloader.cpp4
-rw-r--r--src/lib/corelib/language/moduleloader.h12
6 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index cd0d0024c..b8bbb94ec 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -340,7 +340,7 @@ void BuildGraphLoader::trackProjectChanges()
ldr.setProgressObserver(m_evalContext->observer());
ldr.setOldProjectProbes(restoredProject->probes);
ldr.setLastResolveTime(restoredProject->lastResolveTime);
- QHash<QString, QList<ProbeConstPtr>> restoredProbes;
+ QHash<QString, std::vector<ProbeConstPtr>> restoredProbes;
for (const auto &restoredProduct : qAsConst(allRestoredProducts))
restoredProbes.insert(restoredProduct->uniqueName(), restoredProduct->probes);
ldr.setOldProductProbes(restoredProbes);
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index 4b36384ea..38fbcd5f4 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -577,7 +577,7 @@ public:
QHash<ResolvedModuleConstPtr, QVariantMap> moduleParameters;
std::vector<ResolvedScannerConstPtr> scanners;
std::vector<GroupPtr> groups;
- QList<ProbeConstPtr> probes;
+ std::vector<ProbeConstPtr> probes;
QList<ArtifactPropertiesPtr> artifactProperties;
QStringList missingSourceFiles;
std::unique_ptr<ProductBuildData> buildData;
@@ -693,7 +693,7 @@ public:
QString buildDirectory; // Not saved
QProcessEnvironment environment;
- QList<ProbeConstPtr> probes;
+ std::vector<ProbeConstPtr> probes;
QHash<QString, QString> canonicalFilePathResults; // Results of calls to "File.canonicalFilePath()."
QHash<QString, bool> fileExistsResults; // Results of calls to "File.exists()".
diff --git a/src/lib/corelib/language/loader.cpp b/src/lib/corelib/language/loader.cpp
index beddd6e49..98a90e221 100644
--- a/src/lib/corelib/language/loader.cpp
+++ b/src/lib/corelib/language/loader.cpp
@@ -89,12 +89,12 @@ void Loader::setSearchPaths(const QStringList &_searchPaths)
m_searchPaths = searchPaths;
}
-void Loader::setOldProjectProbes(const QList<ProbeConstPtr> &oldProbes)
+void Loader::setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes)
{
m_oldProjectProbes = oldProbes;
}
-void Loader::setOldProductProbes(const QHash<QString, QList<ProbeConstPtr>> &oldProbes)
+void Loader::setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes)
{
m_oldProductProbes = oldProbes;
}
diff --git a/src/lib/corelib/language/loader.h b/src/lib/corelib/language/loader.h
index 45faf74c9..9883d5b66 100644
--- a/src/lib/corelib/language/loader.h
+++ b/src/lib/corelib/language/loader.h
@@ -60,8 +60,8 @@ public:
void setProgressObserver(ProgressObserver *observer);
void setSearchPaths(const QStringList &searchPaths);
- void setOldProjectProbes(const QList<ProbeConstPtr> &oldProbes);
- void setOldProductProbes(const QHash<QString, QList<ProbeConstPtr>> &oldProbes);
+ void setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes);
+ void setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes);
void setLastResolveTime(const FileTime &time) { m_lastResolveTime = time; }
void setStoredProfiles(const QVariantMap &profiles);
TopLevelProjectPtr loadProject(const SetupProjectParameters &parameters);
@@ -73,8 +73,8 @@ private:
ProgressObserver *m_progressObserver;
ScriptEngine * const m_engine;
QStringList m_searchPaths;
- QList<ProbeConstPtr> m_oldProjectProbes;
- QHash<QString, QList<ProbeConstPtr>> m_oldProductProbes;
+ std::vector<ProbeConstPtr> m_oldProjectProbes;
+ QHash<QString, std::vector<ProbeConstPtr>> m_oldProductProbes;
QVariantMap m_storedProfiles;
FileTime m_lastResolveTime;
};
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 6eef347e8..9dceff7a6 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -257,14 +257,14 @@ void ModuleLoader::setSearchPaths(const QStringList &searchPaths)
qCDebug(lcModuleLoader) << "initial search paths:" << searchPaths;
}
-void ModuleLoader::setOldProjectProbes(const QList<ProbeConstPtr> &oldProbes)
+void ModuleLoader::setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes)
{
m_oldProjectProbes.clear();
for (const ProbeConstPtr& probe : oldProbes)
m_oldProjectProbes[probe->globalId()] << probe;
}
-void ModuleLoader::setOldProductProbes(const QHash<QString, QList<ProbeConstPtr>> &oldProbes)
+void ModuleLoader::setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes)
{
m_oldProductProbes = oldProbes;
}
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index d71897643..cf97c16b0 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -95,7 +95,7 @@ struct ModuleLoaderResult
QString uniqueName() const;
};
- QList<ProbeConstPtr> probes;
+ std::vector<ProbeConstPtr> probes;
std::vector<Dependency> usedProducts;
ModulePropertiesPerGroup modulePropertiesSetInGroups;
ErrorInfo delayedError;
@@ -104,7 +104,7 @@ struct ModuleLoaderResult
std::shared_ptr<ItemPool> itemPool;
Item *root;
QHash<Item *, ProductInfo> productInfos;
- QList<ProbeConstPtr> projectProbes;
+ std::vector<ProbeConstPtr> projectProbes;
Set<QString> qbsFiles;
QVariantMap profileConfigs;
};
@@ -123,8 +123,8 @@ public:
void setProgressObserver(ProgressObserver *progressObserver);
void setSearchPaths(const QStringList &searchPaths);
- void setOldProjectProbes(const QList<ProbeConstPtr> &oldProbes);
- void setOldProductProbes(const QHash<QString, QList<ProbeConstPtr>> &oldProbes);
+ void setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes);
+ void setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes);
void setLastResolveTime(const FileTime &time) { m_lastResolveTime = time; }
void setStoredProfiles(const QVariantMap &profiles);
Evaluator *evaluator() const { return m_evaluator; }
@@ -200,7 +200,7 @@ private:
std::vector<ProjectContext *> projects;
QMultiHash<QString, ProductModuleInfo> productModules;
- QList<ProbeConstPtr> probes;
+ std::vector<ProbeConstPtr> probes;
QString buildDirectory;
};
@@ -374,7 +374,7 @@ private:
std::vector<DependsChainEntry> m_dependsChain;
QHash<QString, QList<ProbeConstPtr>> m_oldProjectProbes;
- QHash<QString, QList<ProbeConstPtr>> m_oldProductProbes;
+ QHash<QString, std::vector<ProbeConstPtr>> m_oldProductProbes;
FileTime m_lastResolveTime;
QHash<CodeLocation, QList<ProbeConstPtr>> m_currentProbes;
QVariantMap m_storedProfiles;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:42:58 +0000