diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-14 17:04:30 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-16 11:56:44 +0200 |
commit | f7973489aef74b1df55f7466cd176e14bbfa76d0 (patch) | |
tree | b9be29a1a857082768a341a87081affdfd99cf36 /src/lib/corelib/buildgraph | |
parent | a623153d2b1af3490bab8885f0b3b768511cb42f (diff) |
deprecate Artifact.fileName in favor of Artifact.filePath
This property is actually a file path, not a mere name.
Task-number: QBS-579
Change-Id: I04e8f03eac97b5f86fe743a4923888a3d2a82c5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph')
-rw-r--r-- | src/lib/corelib/buildgraph/projectbuilddata.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/rulesapplicator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index abc95c8b7..327154e8e 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -495,7 +495,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc product->registerAddedArtifact(outputArtifact); RuleArtifactPtr ruleArtifact = RuleArtifact::create(); - ruleArtifact->fileName = outputArtifact->filePath(); + ruleArtifact->filePath = outputArtifact->filePath(); ruleArtifact->fileTags = outputArtifact->fileTags; rule->artifacts += ruleArtifact; } diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 0da5a2a49..aad148ab3 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -276,7 +276,7 @@ ArtifactSet RulesApplicator::collectOldOutputArtifacts(const ArtifactSet &inputA Artifact *RulesApplicator::createOutputArtifactFromRuleArtifact( const RuleArtifactConstPtr &ruleArtifact, const ArtifactSet &inputArtifacts) { - QScriptValue scriptValue = engine()->evaluate(ruleArtifact->fileName); + QScriptValue scriptValue = engine()->evaluate(ruleArtifact->filePath); if (Q_UNLIKELY(engine()->hasErrorOrException(scriptValue))) { throw ErrorInfo(Tr::tr("Error in Rule.Artifact fileName at %1: %2") .arg(ruleArtifact->location.toString(), scriptValue.toString())); |