aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/depscanner.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-05-19 15:50:21 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-05-20 16:32:49 +0200
commit44518d22d75a4772ba9a3d838b84051c4ebb35ea (patch)
tree509b2da7b7700be64f4b4b36897d4142f127bf7a /src/lib/corelib/buildgraph/depscanner.cpp
parentdc8eb4dc803848ae83b227095a68344211191407 (diff)
let scanners operate on FileResourceBase objects
File dependencies should be scannable for dependencies too. Change-Id: I7223ba65ee6ca02f70c8e48165652550007e91f6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/depscanner.cpp')
-rw-r--r--src/lib/corelib/buildgraph/depscanner.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp
index e273e19d2..0deaae37a 100644
--- a/src/lib/corelib/buildgraph/depscanner.cpp
+++ b/src/lib/corelib/buildgraph/depscanner.cpp
@@ -81,11 +81,11 @@ QStringList PluginDependencyScanner::collectSearchPaths(Artifact *artifact)
}
}
-QStringList PluginDependencyScanner::collectDependencies(Artifact *artifact)
+QStringList PluginDependencyScanner::collectDependencies(FileResourceBase *file)
{
QSet<QString> result;
- QString baseDirOfInFilePath = artifact->dirPath();
- const QString &filepath = artifact->filePath();
+ QString baseDirOfInFilePath = file->dirPath();
+ const QString &filepath = file->filePath();
void *scannerHandle = m_plugin->open(filepath.utf16(), ScanForDependenciesFlag);
if (!scannerHandle)
return QStringList();
@@ -142,8 +142,12 @@ QStringList UserDependencyScanner::collectSearchPaths(Artifact *artifact)
return evaluate(artifact, m_scanner->searchPathsScript);
}
-QStringList UserDependencyScanner::collectDependencies(Artifact *artifact)
+QStringList UserDependencyScanner::collectDependencies(FileResourceBase *file)
{
+ // ### support user dependency scanners for file deps
+ Artifact *artifact = dynamic_cast<Artifact *>(file);
+ if (!artifact)
+ return QStringList();
return evaluate(artifact, m_scanner->scanScript);
}