diff options
author | Richard Weickelt <richard@weickelt.de> | 2019-11-05 23:06:49 +0100 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2019-11-05 23:07:45 +0100 |
commit | 5b03b451cc441ec928c237ffa7c8b35bac792a28 (patch) | |
tree | 5d78d0afffdf46963c8b9ddbd5599e91e74c16b6 /src/lib/corelib/buildgraph/inputartifactscanner.cpp | |
parent | 3ecbe3a17a5822e0f5650e93c712651757082047 (diff) | |
parent | 3e5268b08883eb98ab539887d63985f149e02241 (diff) |
Merge branch '1.15' into master
Change-Id: Ide94d5c74c5ebd5cde4bf8963cf4449ed026cc39
Diffstat (limited to 'src/lib/corelib/buildgraph/inputartifactscanner.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/inputartifactscanner.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index c8b2cb779..81cbe2178 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -240,7 +240,7 @@ void InputArtifactScanner::scanForScannerFileDependencies(DependencyScanner *sca if (scanData.lastScanTime < fileToBeScanned->timestamp()) { try { qCDebug(lcDepScan) << "scanning" << FileInfo::fileName(filePathToBeScanned); - scanWithScannerPlugin(scanner, fileToBeScanned, &scanData.rawScanResult); + scanWithScannerPlugin(scanner, inputArtifact, fileToBeScanned, &scanData.rawScanResult); scanData.lastScanTime = FileTime::currentTime(); } catch (const ErrorInfo &error) { m_logger.printWarning(error); @@ -364,12 +364,13 @@ void InputArtifactScanner::handleDependency(ResolvedDependency &dependency) } void InputArtifactScanner::scanWithScannerPlugin(DependencyScanner *scanner, + Artifact *inputArtifact, FileResourceBase *fileToBeScanned, RawScanResult *scanResult) { scanResult->deps.clear(); const QStringList &dependencies = scanner->collectDependencies( - m_artifact, fileToBeScanned, m_fileTagsForScanner.constData()); + inputArtifact, fileToBeScanned, m_fileTagsForScanner.constData()); for (const QString &s : dependencies) scanResult->deps.push_back(RawScannedDependency(s)); } |