diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-25 15:34:06 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-26 15:22:29 +0200 |
| commit | 89d382cb766c1c98d2d7a72b72fa249ba7e80326 (patch) | |
| tree | 79574006e7b2b3351a30d8efc6e92d0fbf80b7c9 /src/lib/buildgraph/executor.h | |
| parent | a5d59c361cc8a40dd7e1ed77ef32b4091ffb0f23 (diff) | |
| download | qbs-89d382cb766c1c98d2d7a72b72fa249ba7e80326.tar.gz | |
scan input artifacts if dependency scan result is not available
If the user removes just the build graph and keeps the object files,
then we have artifacts that are up-to-date but don't have the correct
dependencies. For those artifacts we have to explicitely invoke the
dependency scanners.
Change-Id: I6310dab5ac5c4f412c50cab9b00a1619bb6259cd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/lib/buildgraph/executor.h')
| -rw-r--r-- | src/lib/buildgraph/executor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h index c9b4f2f41..393eafd44 100644 --- a/src/lib/buildgraph/executor.h +++ b/src/lib/buildgraph/executor.h @@ -121,7 +121,6 @@ protected: void initLeavesTopDown(Artifact *artifact, QSet<Artifact *> &seenArtifacts); bool run(QFutureInterface<bool> &futureInterface); qbs::FileTime timeStamp(Artifact *artifact); - bool isOutOfDate(Artifact *artifact, bool *fileExists); void execute(Artifact *artifact); void finishArtifact(Artifact *artifact); void finish(); @@ -130,7 +129,7 @@ protected: void addExecutorJobs(int jobNumber); void removeExecutorJobs(int jobNumber); bool runAutoMoc(); - void scanInputArtifacts(Artifact *artifact, bool *newDependencyAdded); + void scanInputArtifacts(Artifact *artifact, bool *newDependencyAdded, bool printInfo = false); void scanForFileDependencies(ScannerPlugin *scannerPlugin, const QStringList &includePaths, Artifact *outputArtifact, Artifact *inputArtifact, bool *newDependencyAdded); static Dependency resolveWithIncludePath(const QString &includePath, const QString &dependencyDirPath, const QString &dependencyFileName, BuildProduct *buildProduct); static void resolveScanResultDependencies(const QStringList &includePaths, Artifact *processedArtifact, Artifact *inputArtifact, const ScanResultCache::Result &scanResult, |