aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/moduleloader.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-04-26 09:48:51 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-04-26 16:02:39 +0000
commit619a0d76d2c1cbb86b8dd01f85768e97e5f81810 (patch)
treed3b27d279d244df94616e9489d9cfd0ff09355ce /src/lib/corelib/language/moduleloader.h
parente5f6345d082d10d49d36e9471428e25936cec340 (diff)
Make {TopLevelProject|ResolvedProduct}::probes vectors
The value_type is not suitable for QList. Change-Id: I46b90fa9d4d42c02aace290133157f48a7bf48d1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/moduleloader.h')
-rw-r--r--src/lib/corelib/language/moduleloader.h12
1 files changed, 6 insertions, 6 deletions
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;