diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-26 09:25:39 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-26 15:47:21 +0000 |
commit | 5a4a53d098f1545b63693b1d3cdafd08ff856d59 (patch) | |
tree | 728081e38ffd18b5812b0eaecd0a0c337ec69987 | |
parent | 2a21ae8395c099d812515f22ae1526546cc8a382 (diff) |
Make ResolvedProduct::scanners a vector
The value_type is not suitable for QList
Change-Id: Ib24ff5c404aa4c6fa90c82c2bb40359a9306637a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/lib/corelib/api/project.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/inputartifactscanner.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/language/language.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp index a7789521e..d17c0bf02 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -684,7 +684,7 @@ void ProjectPrivate::updateInternalCodeLocations(const ResolvedProjectPtr &proje } } } - for (const ResolvedScannerConstPtr &scanner : qAsConst(product->scanners)) { + for (const ResolvedScannerConstPtr &scanner : product->scanners) { updateLocationIfNecessary(scanner->searchPathsScript.location(), changeLocation, lineOffset); updateLocationIfNecessary(scanner->scanScript.location(), changeLocation, lineOffset); diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index 8e2e9172b..644b95d79 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -190,7 +190,7 @@ Set<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifac auto pluginScanner = new PluginDependencyScanner(scanner); cache.scanners.push_back(DependencyScannerPtr(pluginScanner)); } - for (const ResolvedScannerConstPtr &scanner : qAsConst(product->scanners)) { + for (const ResolvedScannerConstPtr &scanner : product->scanners) { if (scanner->inputs.contains(fileTag)) { cache.scanners.push_back(DependencyScannerPtr( new UserDependencyScanner(scanner, engine))); diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index 10da347cb..9f9e7a513 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -575,7 +575,7 @@ public: std::vector<FileTaggerConstPtr> fileTaggers; std::vector<ResolvedModulePtr> modules; QHash<ResolvedModuleConstPtr, QVariantMap> moduleParameters; - QList<ResolvedScannerConstPtr> scanners; + std::vector<ResolvedScannerConstPtr> scanners; QList<GroupPtr> groups; QList<ProbeConstPtr> probes; QList<ArtifactPropertiesPtr> artifactProperties; |