diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-20 18:17:32 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-25 14:23:59 +0100 |
| commit | 8611f5b6ae9898a765791bde5f72900fc95538dd (patch) | |
| tree | e88bef4a9d2fd2585469a31dc240b353b3a35ff6 /src/lib/corelib/language/itemreaderastvisitor.h | |
| parent | a55314a6dd3c2f4778b3de259748f1ee6ba6e16b (diff) | |
rename mergeItem to inheritItem
Change-Id: I21ad394076a7f2b2b2a1ff8892d427991e5613e4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/language/itemreaderastvisitor.h')
| -rw-r--r-- | src/lib/corelib/language/itemreaderastvisitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h index 409b5104e..b8800608a 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.h +++ b/src/lib/corelib/language/itemreaderastvisitor.h @@ -66,7 +66,7 @@ private: Item *targetItemForBinding(Item *item, const QStringList &binding, const CodeLocation &bindingLocation); void checkImportVersion(const QbsQmlJS::AST::SourceLocation &versionToken) const; - static void mergeItem(Item *dst, const Item *src, + static void inheritItem(Item *dst, const Item *src, const ItemReaderResult &baseFile); void ensureIdScope(const FileContextPtr &file); void setupAlternatives(Item *item); |