[Backport] 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.

(cherry picked from commit MeVisLab/pythonqt@d059d72)

Author: usiems

src/PythonQtClassInfo.cpp

@@ -870,26 +870,19 @@ PyObject* PythonQtClassInfo::findEnumWrapper(const QByteArray& name, PythonQtCla
   return enumWrapper;
 }
 
-// required for the code below (for versions before Qt 6)
-Q_DECLARE_METATYPE(PythonQtObjectPtr)
-
 void PythonQtClassInfo::createEnumWrappers(const QMetaObject* meta)
 {
   for (int i = meta->enumeratorOffset();i<meta->enumeratorCount();i++) {
     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)), enumValuePtr.toLocalVariant());
     }
-#endif
     _enumWrappers.append(p);
   }
 }