aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/inputartifactscanner.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-12-08 10:45:35 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2017-01-05 10:24:34 +0000
commiteee738fa94293d9f17bb337e7740f990ab2c67a9 (patch)
tree671c3f3417548feb62a6e7e0f616aeff209f8e3f /src/lib/corelib/buildgraph/inputartifactscanner.cpp
parent8d3dabcac333a6fe02b54cae2afc75c410e95929 (diff)
Move class ScanResultCache::Dependency into its own file
We plan to use it in a wider scope. Change-Id: I5a098a7e65513b2d4279eac3ff109386d8001666 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/inputartifactscanner.cpp')
-rw-r--r--src/lib/corelib/buildgraph/inputartifactscanner.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index b39e09010..056c67fc5 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -69,7 +69,7 @@ InputArtifactScannerContext::~InputArtifactScannerContext()
{
}
-static void resolveDepencency(const ScanResultCache::Dependency &dependency,
+static void resolveDepencency(const RawScannedDependency &dependency,
const ResolvedProduct *product, ResolvedDependency *result,
const QString &baseDir = QString())
{
@@ -254,7 +254,7 @@ void InputArtifactScanner::resolveScanResultDependencies(const Artifact *inputAr
const ScanResultCache::Result &scanResult, QList<FileResourceBase *> *artifactsToScan,
InputArtifactScannerContext::ScannerResolvedDependenciesCache &cache)
{
- foreach (const ScanResultCache::Dependency &dependency, scanResult.deps) {
+ foreach (const RawScannedDependency &dependency, scanResult.deps) {
const QString &dependencyFilePath = dependency.filePath();
InputArtifactScannerContext::ResolvedDependencyCacheItem &cachedResolvedDependencyItem
= cache.resolvedDependenciesCache[dependency.dirPath()][dependency.fileName()];
@@ -363,7 +363,7 @@ void InputArtifactScanner::scanWithScannerPlugin(DependencyScanner *scanner,
const QStringList &dependencies
= scanner->collectDependencies(fileToBeScanned, m_fileTagsForScanner.constData());
for (const QString &s : dependencies)
- scanResult->deps += ScanResultCache::Dependency(s);
+ scanResult->deps += RawScannedDependency(s);
scanResult->valid = true;
}