From 3e5268b08883eb98ab539887d63985f149e02241 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 4 Nov 2019 17:37:51 +0100 Subject: Fix user dependency scanners Since commit 9e55ddfa97, we mistakenly passed the output artifact to the scan script, rather than the input artifact. Fixes: QBS-1511 Change-Id: Ieb2a2b3bdf0366ef203e96d578a30a0ef8b1838a Reviewed-by: Joerg Bornemann --- src/lib/corelib/buildgraph/inputartifactscanner.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/corelib/buildgraph/inputartifactscanner.cpp') 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)); } -- cgit v1.2.3