3 files changed, 29 insertions, 14 deletions

diff --git a/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst b/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst
index 0d24a6d52..646e76043 100644
--- a/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst
+++ b/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst
@@ -150,6 +150,7 @@ enum-type
         <typesystem>
             <enum-type name="..."
                 identified-by-value="..."
+                class="yes | no"
                 since="..."
                 flags="yes | no"
                 flags-revision="..."
@@ -179,6 +180,10 @@ enum-type
     Notice that the **enum-type** tag can either have **name** or **identified-by-value**
     but not both.
 
+    The *optional* boolean attribute **class** specifies whether the underlying
+    enumeration is a C++ 11 enumeration class. In that case, the enumeration values
+    need to be qualified by the enumeration name to match the C++ Syntax.
+
     The **revision** attribute can be used to specify a revision for each type, easing the
     production of ABI compatible bindings.
 
diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken2/ApiExtractor/typesystem.cpp
index 749ce2f71..69dccbb86 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystem.cpp
@@ -58,6 +58,7 @@ static inline QString enumNameAttribute() { return QStringLiteral("enum-name");
 static inline QString argumentTypeAttribute() { return QStringLiteral("argument-type"); }
 static inline QString returnTypeAttribute() { return QStringLiteral("return-type"); }
 static inline QString xPathAttribute() { return QStringLiteral("xpath"); }
+static inline QString enumIdentifiedByValueAttribute() { return QStringLiteral("identified-by-value"); }
 
 static inline QString noAttributeValue() { return QStringLiteral("no"); }
 static inline QString yesAttributeValue() { return QStringLiteral("yes"); }
@@ -758,7 +759,8 @@ bool Handler::startElement(const QStringRef &n, const QXmlStreamAttributes &atts
             attributes.insert(QLatin1String("lower-bound"), QString());
             attributes.insert(QLatin1String("force-integer"), noAttributeValue());
             attributes.insert(QLatin1String("extensible"), noAttributeValue());
-            attributes.insert(QLatin1String("identified-by-value"), QString());
+            attributes.insert(enumIdentifiedByValueAttribute(), QString());
+            attributes.insert(classAttribute(), falseAttributeValue());
             break;
         case StackElement::ValueTypeEntry:
             attributes.insert(QLatin1String("default-constructor"), QString());
@@ -852,9 +854,10 @@ bool Handler::startElement(const QStringRef &n, const QXmlStreamAttributes &atts
         }
 
         if (element->type == StackElement::EnumTypeEntry) {
+            const QString identifiedByValue = attributes.value(enumIdentifiedByValueAttribute());
             if (name.isEmpty()) {
-                name = attributes[QLatin1String("identified-by-value")];
-            } else if (!attributes[QLatin1String("identified-by-value")].isEmpty()) {
+                name = identifiedByValue;
+            } else if (!identifiedByValue.isEmpty()) {
                 m_error = QLatin1String("can't specify both 'name' and 'identified-by-value' attributes");
                 return false;
             }
@@ -939,7 +942,11 @@ bool Handler::startElement(const QStringRef &n, const QXmlStreamAttributes &atts
                 m_currentEnum =
                     new EnumTypeEntry(QStringList(names.mid(0, names.size() - 1)).join(colonColon()),
                                       names.constLast(), since);
-            m_currentEnum->setAnonymous(!attributes[QLatin1String("identified-by-value")].isEmpty());
+            if (!attributes.value(enumIdentifiedByValueAttribute()).isEmpty()) {
+                m_currentEnum->setEnumKind(EnumTypeEntry::AnonymousEnum);
+            } else if (convertBoolean(attributes.value(classAttribute()), classAttribute(), false)) {
+                m_currentEnum->setEnumKind(EnumTypeEntry::EnumClass);
+            }
             element->entry = m_currentEnum;
             m_currentEnum->setCodeGeneration(m_generate);
             m_currentEnum->setTargetLangPackage(m_defaultPackage);
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index f2b5a9320..62d348f69 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1045,6 +1045,12 @@ private:
 class EnumTypeEntry : public TypeEntry
 {
 public:
+    enum EnumKind {
+        CEnum,         // Standard C: enum Foo { value1, value2 }
+        AnonymousEnum, //             enum { value1, value2 }
+        EnumClass      // C++ 11    : enum class Foo { value1, value2 }
+    };
+
     explicit EnumTypeEntry(const QString &nspace, const QString &enumName, double vr);
 
     QString targetLangPackage() const override;
@@ -1065,6 +1071,9 @@ public:
         m_qualifier = q;
     }
 
+    EnumKind enumKind() const { return m_enumKind; }
+    void setEnumKind(EnumKind kind) { m_enumKind = kind; }
+
     bool preferredConversion() const override;
 
     bool isBoundsChecked() const
@@ -1108,7 +1117,7 @@ public:
         m_extensible = is;
     }
 
-    bool isEnumValueRejected(const QString &name)
+    bool isEnumValueRejected(const QString &name) const
     {
         return m_rejectedEnums.contains(name);
     }
@@ -1130,14 +1139,7 @@ public:
         m_forceInteger = force;
     }
 
-    bool isAnonymous() const
-    {
-        return m_anonymous;
-    }
-    void setAnonymous(bool anonymous)
-    {
-        m_anonymous = anonymous;
-    }
+    bool isAnonymous() const { return m_enumKind == AnonymousEnum; }
 
 private:
     QString m_packageName;
@@ -1151,9 +1153,10 @@ private:
 
     FlagsTypeEntry *m_flags = nullptr;
 
+    EnumKind m_enumKind = CEnum;
+
     bool m_extensible = false;
     bool m_forceInteger = false;
-    bool m_anonymous = false;
 };
 
 // EnumValueTypeEntry is used for resolving integer type templates