Introduce alias names for types

Add an entry "aliases" to a type entry in the type database, these types
will automatically be changed to the main type in the generated code.

This fixes the problem that in Qt 6.7 QAudio enums are used under the
QtAudio alias. These enum names are now automatically mapped to the
QAudio name with the right alias entries in the type database.

This doesn't make QAudio available as QtAudio in Python, though.

Author: usiems

generator/typesystem.cpp

@@ -540,6 +540,7 @@ bool Handler::startElement(const QString &, const QString &n,
 
         QHash<QString, QString> attributes;
         attributes["name"] = QString();
+        attributes["aliases"] = QString();
 
         switch (element->type) {
         case StackElement::PrimitiveTypeEntry:
@@ -586,15 +587,20 @@ bool Handler::startElement(const QString &, const QString &n,
         fetchAttributeValues(tagName, atts, &attributes);
 
         QString name = attributes["name"];
+        QStringList aliases = attributes["aliases"].split(',', Qt::SkipEmptyParts);
 
         // We need to be able to have duplicate primitive type entries, or it's not possible to
         // cover all primitive java types (which we need to do in order to support fake
         // meta objects)
         if (element->type != StackElement::PrimitiveTypeEntry) {
-            TypeEntry *tmp = m_database->findType(name);
-            if (tmp != 0) {
+            if (m_database->findType(name)) {
                 ReportHandler::warning(QString("Duplicate type entry: '%1'").arg(name));
             }
+            for (const QString& alias : aliases) {
+                if (m_database->findType(alias)) {
+                    ReportHandler::warning(QString("Duplicate alias type entry: '%1'").arg(alias));
+                }
+            }
         }
 
         if (name.isEmpty()) {
@@ -758,6 +764,7 @@ bool Handler::startElement(const QString &, const QString &n,
             Q_ASSERT(false);
         };
 
+        element->entry->setAliases(aliases);  // also add type under given aliases into type database
         if (element->entry)
             m_database->addType(element->entry);
         else
@@ -1831,6 +1838,14 @@ bool TypeDatabase::isFieldRejected(const QString &class_name, const QString &fie
     return false;
 }
 
+void TypeDatabase::addType(TypeEntry* e)
+{
+    m_entries[e->qualifiedCppName()].append(e);
+    for (const QString& alias : e->aliases()) {
+        m_entries[alias].append(e);
+    }
+}
+
 FlagsTypeEntry *TypeDatabase::findFlagsType(const QString &name) const
 {
     FlagsTypeEntry *fte = (FlagsTypeEntry *) findType(name);

generator/typesystem.h

@@ -513,6 +513,10 @@ class TypeEntry
     // The type's name in C++, fully qualified
     QString name() const { return m_name; }
 
+    //! Alias names for this type (need to be fully qualified)
+    QStringList aliases() const { return m_aliases; }
+    void setAliases(const QStringList& aliases) { m_aliases = aliases; }
+
     uint codeGeneration() const { return m_code_generation; }
     void setCodeGeneration(uint cg) { m_code_generation = cg; }
 
@@ -553,6 +557,7 @@ class TypeEntry
 
 private:
     QString m_name;
+    QStringList m_aliases;
     Type m_type;
     uint m_code_generation;
     CustomFunction m_customConstructor;
@@ -1187,7 +1192,7 @@ class TypeDatabase
     bool isFieldRejected(const QString &class_name, const QString &field_name);
     bool isEnumRejected(const QString &class_name, const QString &enum_name);
 
-    void addType(TypeEntry *e) { m_entries[e->qualifiedCppName()].append(e); }
+    void addType(TypeEntry* e);
 
     SingleTypeEntryHash flagsEntries() const { return m_flags_entries; }
     FlagsTypeEntry *findFlagsType(const QString &name) const;

generator/typesystem_multimedia.xml

@@ -68,9 +68,10 @@
 <enum-type name="QMediaPlayer::MediaStatus"/>
 <enum-type name="QMediaPlayer::Error"/>
 <enum-type name="QMediaPlayer::Flag" flags="QMediaPlayer::Flags"/>
-<enum-type name="QAudio::Error"/>
+<enum-type name="QAudio::Error" aliases="QtAudio::Error"/>
+<enum-type name="QAudio::State" aliases="QtAudio::State"/>
+<enum-type name="QAudio::VolumeScale" aliases="QtAudio::VolumeScale"/>
 <enum-type name="QAudio::Mode"/>
-<enum-type name="QAudio::State"/>
 <enum-type name="QAudio::Role"/>
 <enum-type name="QMultimedia::SupportEstimate"/>
 <enum-type name="QMultimedia::EncodingQuality"/>
@@ -192,7 +193,6 @@
 <object-type name="QVideoRendererControl"/>
 <object-type name="QVideoWidgetControl"/>
 <object-type name="QVideoWindowControl"/>
-<enum-type name="QAudio::VolumeScale"/>
 
 <object-type name="QMediaServiceProviderPlugin"/>