diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-06 10:06:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-17 14:23:19 +0200 |
| commit | ab60f6e4c489ace089785c002d75018ac6a31e30 (patch) | |
| tree | 91053ec752d9aa56df8061ba5e62c13431804a6b /src/lib/buildgraph/inputartifactscanner.cpp | |
| parent | d3877c67d060d454ac66fde7b6ad41a2bb50d808 (diff) | |
| download | qbs-ab60f6e4c489ace089785c002d75018ac6a31e30.tar.gz | |
Allow projects to be nested.
This is nice to have for grouping products and
a requirement for aggregating existing projects
into a bigger one.
Change-Id: I3394642e95ea57dbc6bf1603cfed6902a5906e4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/inputartifactscanner.cpp')
| -rw-r--r-- | src/lib/buildgraph/inputartifactscanner.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/buildgraph/inputartifactscanner.cpp b/src/lib/buildgraph/inputartifactscanner.cpp index f2ea1220d..f6863bc3b 100644 --- a/src/lib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/buildgraph/inputartifactscanner.cpp @@ -88,12 +88,12 @@ static void resolveWithIncludePath(const QString &includePath, if (!dependency.isClean()) absDirPath = QDir::cleanPath(absDirPath); - const ResolvedProject *project = product->project.data(); + ResolvedProject *project = product->project.data(); Artifact *fileDependencyArtifact = 0; Artifact *dependencyInProduct = 0; Artifact *dependencyInOtherProduct = 0; - foreach (Artifact *artifact, - project->buildData->lookupArtifacts(absDirPath, dependency.fileName())) { + foreach (Artifact *artifact, project->topLevelProject() + ->buildData->lookupArtifacts(absDirPath, dependency.fileName())) { if (artifact->artifactType == Artifact::FileDependency) fileDependencyArtifact = artifact; else if (artifact->product == product) @@ -319,7 +319,7 @@ void InputArtifactScanner::handleDependency(ResolvedDependency &dependency) dependency.artifact->artifactType = Artifact::FileDependency; dependency.artifact->properties = m_artifact->properties; dependency.artifact->setFilePath(dependency.filePath); - m_artifact->project->buildData->insertFileDependency(dependency.artifact); + m_artifact->topLevelProject()->buildData->insertFileDependency(dependency.artifact); } else if (dependency.artifact->artifactType == Artifact::FileDependency) { // The dependency exists in the project's list of file dependencies. if (m_logger.traceEnabled()) { |