Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id0fc76666bbdb254a833eeb6909a0874b2611bf3

1 files changed, 6 insertions, 1 deletions

diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
index e134ebcfe..944445579 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
@@ -56,6 +56,11 @@ static inline bool isClassCursor(const CXCursor &c)
         || c.kind == CXCursor_ClassTemplatePartialSpecialization;
 }
 
+static inline bool isClassOrNamespaceCursor(const CXCursor &c)
+{
+    return c.kind == CXCursor_Namespace || isClassCursor(c);
+}
+
 static inline bool withinClassDeclaration(const CXCursor &cursor)
 {
     return isClassCursor(clang_getCursorLexicalParent(cursor));
@@ -979,7 +984,7 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor)
         break;
     case CXCursor_VarDecl:
         // static class members are seen as CXCursor_VarDecl
-        if (!d->m_currentClass.isNull() && isClassCursor(clang_getCursorSemanticParent(cursor))) {
+        if (isClassOrNamespaceCursor(clang_getCursorSemanticParent(cursor))) {
              d->addField(cursor);
              d->m_currentField->setStatic(true);
         }