aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib')
-rw-r--r--src/lib/corelib/buildgraph/inputartifactscanner.cpp5
-rw-r--r--src/lib/corelib/buildgraph/inputartifactscanner.h4
2 files changed, 5 insertions, 4 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));
}
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.h b/src/lib/corelib/buildgraph/inputartifactscanner.h
index ac51af579..7b7630b6f 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.h
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.h
@@ -133,8 +133,8 @@ private:
const RawScanResult &scanResult, QList<FileResourceBase *> *artifactsToScan,
InputArtifactScannerContext::ScannerResolvedDependenciesCache &cache);
void handleDependency(ResolvedDependency &dependency);
- void scanWithScannerPlugin(DependencyScanner *scanner, FileResourceBase *fileToBeScanned,
- RawScanResult *scanResult);
+ void scanWithScannerPlugin(DependencyScanner *scanner, Artifact *inputArtifact,
+ FileResourceBase *fileToBeScanned, RawScanResult *scanResult);
Artifact * const m_artifact;
RawScanResults &m_rawScanResults;