Add enum values to the enum type object itself in any case...

...not just when it is a enum class in C++. It seems PySide does this too.
MeVisLab · Dec 20, 2023 · 4f113db · 4f113db
1 parent e9197ec
commit 4f113db
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/PythonQtClassInfo.cpp b/src/PythonQtClassInfo.cpp
@@ -879,17 +879,13 @@ void PythonQtClassInfo::createEnumWrappers(const QMetaObject* meta)
     QMetaEnum e = meta->enumerator(i);
     PythonQtObjectPtr p;
     p.setNewRef(PythonQtPrivate::createNewPythonQtEnumWrapper(e.name(), _pythonQtClassWrapper));
-#if QT_VERSION > 0x050800
-    if (e.isScoped()) {
-      // add enum values to the enum type itself, in case enum value names are so generic
-      // that they are not unique
-      for (int j = 0; j < e.keyCount(); j++) {
-        PythonQtObjectPtr enumValuePtr;
-        enumValuePtr.setNewRef(PythonQtPrivate::createEnumValueInstance(p.object(), e.value(j)));
-        p.addVariable(escapeReservedNames(e.key(j)), QVariant::fromValue(enumValuePtr));
-      }
+    // add enum values to the enum type itself, in case enum value names are so generic
+    // that they are not unique
+    for (int j = 0; j < e.keyCount(); j++) {
+      PythonQtObjectPtr enumValuePtr;
+      enumValuePtr.setNewRef(PythonQtPrivate::createEnumValueInstance(p.object(), e.value(j)));
+      p.addVariable(escapeReservedNames(e.key(j)), QVariant::fromValue(enumValuePtr));
     }
-#endif
     _enumWrappers.append(p);
   }
 }