diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-05-26 14:13:26 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-06-01 14:30:17 +0200 |
| commit | 68a1c7d5c998180005a4b4bc872cf2cd3e5400a1 (patch) | |
| tree | bb6bdf5ecc44f11372ea49790d6875e22fc8bf5d /src/lib/buildgraph/executor.h | |
| parent | e11a8cd42140df0b02d41c9974cc9d3612cfecb3 (diff) | |
| download | qbs-68a1c7d5c998180005a4b4bc872cf2cd3e5400a1.tar.gz | |
Move input artifact scanning into a dedicated class.
No functional changes.
Change-Id: I48b1b71dae3c13c1dd167b11a88772474db6f06a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/lib/buildgraph/executor.h')
| -rw-r--r-- | src/lib/buildgraph/executor.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h index f06913d11..3d4084406 100644 --- a/src/lib/buildgraph/executor.h +++ b/src/lib/buildgraph/executor.h @@ -43,7 +43,6 @@ #include <buildgraph/artifact.h> #include <Qbs/processoutput.h> #include <tools/settings.h> -#include <tools/scannerpluginmanager.h> #include <buildgraph/scanresultcache.h> #include <QtCore/QObject> @@ -101,19 +100,6 @@ protected slots: void resetArtifactsToUntouched(); protected: - struct Dependency - { - Dependency() - : artifact(0) - {} - - bool isValid() const { return !filePath.isNull(); } - - QString filePath; - Artifact *artifact; - }; - -protected: void prepareBuildGraph(Artifact::BuildState buildState); void prepareBuildGraph_impl(Artifact *artifact, Artifact::BuildState buildState); void updateBuildGraph(Artifact::BuildState buildState); @@ -134,12 +120,6 @@ protected: void removeExecutorJobs(int jobNumber); bool runAutoMoc(); void printScanningMessageOnce(); - void scanInputArtifacts(Artifact *artifact, bool *newDependencyAdded); - 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, - const QString &filePathToBeScanned, QStringList *filePathsToScan, bool *newDependencyAdded); - static void handleDependency(Artifact *processedArtifact, Dependency &dependency, bool *newDependencyAdded); void insertLeavesAfterAddingDependencies(QVector<Artifact *> dependencies); void cancelJobs(); |