diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-04 15:30:21 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-05 18:20:00 +0200 |
| commit | 268865fc05508deb6a67ef5389fd05bc499581ac (patch) | |
| tree | fa48c901522121cc29a64efbc35c920f4a7c851e /src/lib/corelib/language | |
| parent | bf305b1e2e963956c48dec9881312e13ac600bd6 (diff) | |
show error location in Rule.Artifact
Change-Id: Ic492a3e7d7a28633f96e808680ef695d33eb79f2
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/language')
| -rw-r--r-- | src/lib/corelib/language/language.cpp | 6 | ||||
| -rw-r--r-- | src/lib/corelib/language/language.h | 1 | ||||
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 379f2ea8e..324739aaa 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -203,7 +203,8 @@ void RuleArtifact::load(PersistentPool &pool) pool.stream() >> fileName >> fileTags - >> alwaysUpdated; + >> alwaysUpdated + >> location; int i; pool.stream() >> i; @@ -221,7 +222,8 @@ void RuleArtifact::store(PersistentPool &pool) const pool.stream() << fileName << fileTags - << alwaysUpdated; + << alwaysUpdated + << location; pool.stream() << bindings.count(); for (int i = bindings.count(); --i >= 0;) { diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index fdfb7e44e..f62e63333 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -96,6 +96,7 @@ public: QString fileName; FileTags fileTags; bool alwaysUpdated; + CodeLocation location; class Binding { diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index e54074f14..a7bd12a31 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -673,6 +673,7 @@ void ProjectResolver::resolveRuleArtifact(const RulePtr &rule, Item *item, return; RuleArtifactPtr artifact = RuleArtifact::create(); rule->artifacts += artifact; + artifact->location = item->location(); artifact->fileName = verbatimValue(item, QLatin1String("fileName")); artifact->fileTags = m_evaluator->fileTagsValue(item, QLatin1String("fileTags")); artifact->alwaysUpdated = m_evaluator->boolValue(item, QLatin1String("alwaysUpdated")); |