Automatically add enums marked with Q_ENUM to TypeDatabase

If this is for a QObject-derived class, they are ignored automatically,
but if it is for a Q_GADGET, they obviously are intended for use with
scripting

Author: usiems

generator/abstractmetabuilder.cpp

@@ -951,9 +951,17 @@ AbstractMetaEnum *AbstractMetaBuilder::traverseEnum(EnumModelItem enum_item, Abs
     }
 
     QString qualified_name = enum_item->qualifiedName().join("::");
+    QString enum_name = enum_item->name();
+
+    bool hasQEnumDeclaration = enumsDeclarations.contains(qualified_name)
+                            || enumsDeclarations.contains(enum_name);
 
     TypeEntry *type_entry = TypeDatabase::instance()->findType(qualified_name);
-    QString enum_name = enum_item->name();
+    if (hasQEnumDeclaration && !type_entry) {
+        // automatically add enum type declared as Q_ENUM
+        type_entry = new TypeEntry(qualified_name, TypeEntry::EnumType);
+        TypeDatabase::instance()->addType(type_entry);
+    }
 
     QString class_name;
     if (m_current_class)
@@ -969,12 +977,11 @@ AbstractMetaEnum *AbstractMetaBuilder::traverseEnum(EnumModelItem enum_item, Abs
         ReportHandler::warning(QString("enum '%1' does not have a type entry or is not an enum")
                                .arg(qualified_name));
         m_rejected_enums.insert(qualified_name, NotInTypeSystem);
-       return 0;
+        return 0;
     }
 
     AbstractMetaEnum *meta_enum = createMetaEnum();
-    if (   enumsDeclarations.contains(qualified_name)
-        || enumsDeclarations.contains(enum_name)) {
+    if (hasQEnumDeclaration) {
         meta_enum->setHasQEnumsDeclaration(true);
     }
 
@@ -1124,8 +1131,8 @@ AbstractMetaClass *AbstractMetaBuilder::traverseClass(ClassModelItem class_item)
 
     parseQ_Property(meta_class, class_item->propertyDeclarations());
 
-    traverseFunctions(model_dynamic_cast<ScopeModelItem>(class_item), meta_class);
     traverseEnums(model_dynamic_cast<ScopeModelItem>(class_item), meta_class, class_item->enumsDeclarations());
+    traverseFunctions(model_dynamic_cast<ScopeModelItem>(class_item), meta_class);
     traverseFields(model_dynamic_cast<ScopeModelItem>(class_item), meta_class);
 
     // Inner classes