aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/itemreaderastvisitor.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-01-31 09:23:54 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-01-31 13:50:36 +0000
commit764fd1f6ea3f317ad4b50a865ab56b8a8c93080f (patch)
tree53aaf9d4ddede25716f043b5666d09260e539f14 /src/lib/corelib/language/itemreaderastvisitor.h
parent3953e11a8491323bed6d45d3ced59f15b87a96a8 (diff)
Fix SOFT ASSERT for parametrized dependencies in Export/Module itemsv1.10.11.10
The SOFT ASSERT was triggered, because the Depends items in Export/Module had the type ModuleInstance instead of ModuleParameters. Move the assignment of that item type to ItemReaderASTVisitor instead of adjusting it in the ModuleLoader, because this ensures that we don't have to traverse prototypes in the adjustment procedure. Task-number: QBS-1287 Change-Id: Ie1a1080d40b8bebe5c205f8b34298469cde5bd46 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/itemreaderastvisitor.h')
-rw-r--r--src/lib/corelib/language/itemreaderastvisitor.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h
index 5db03b411..6bd39ceb2 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/language/itemreaderastvisitor.h
@@ -88,6 +88,7 @@ private:
Logger &m_logger;
QHash<QStringList, QString> m_typeNameToFile;
Item *m_item = nullptr;
+ ItemType m_instanceItemType = ItemType::ModuleInstance;
};
} // namespace Internal