diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-24 08:11:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-24 08:12:38 +0200 |
| commit | 8c772c12612b408b42e66ad0627d37477f42255a (patch) | |
| tree | 93e6f1f594206e6167c3996cca5a702ad1f600bc /sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp | |
| parent | c134129bd55ebf91d3a74c720b8bd659f13bd93d (diff) | |
| parent | 0f9b8cf0f2873e1697ab56c50087a81f1dd61415 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp index 40f915028..3ced0e06c 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp @@ -885,15 +885,13 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor) appendDiagnostic(d); return Error; } - // If possible, continue existing namespace (as otherwise, all headers - // where a namespace is continued show up in the type database). + // Treat namespaces separately to allow for extending namespaces + // in subsequent modules. NamespaceModelItem namespaceItem = parentNamespaceItem->findNamespace(name); - if (namespaceItem.isNull()) { - namespaceItem.reset(new _NamespaceModelItem(d->m_model, name)); - setFileName(cursor, namespaceItem.data()); - namespaceItem->setScope(d->m_scope); - parentNamespaceItem->addNamespace(namespaceItem); - } + namespaceItem.reset(new _NamespaceModelItem(d->m_model, name)); + setFileName(cursor, namespaceItem.data()); + namespaceItem->setScope(d->m_scope); + parentNamespaceItem->addNamespace(namespaceItem); d->pushScope(namespaceItem); } break; |