qmltc: Compile QML enums into C++

Task-number: QTBUG-84368
Change-Id: Idf6c724496c807477ce0914ab0d32a80a9b90b5a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

4 files changed, 31 insertions, 2 deletions

diff --git a/tools/qmltc/qmltccodewriter.cpp b/tools/qmltc/qmltccodewriter.cpp
index 7ce489c899..dff4885604 100644
--- a/tools/qmltc/qmltccodewriter.cpp
+++ b/tools/qmltc/qmltccodewriter.cpp
@@ -302,6 +302,7 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcEnum &enumerati
         code.rawAppendToHeader(str, 1);
     }
     code.rawAppendToHeader(u"};");
+    code.rawAppendToHeader(enumeration.ownMocLine);
 }
 
 void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcMethod &method)
diff --git a/tools/qmltc/qmltccompiler.cpp b/tools/qmltc/qmltccompiler.cpp
index 4654ecfd20..0aeff12217 100644
--- a/tools/qmltc/qmltccompiler.cpp
+++ b/tools/qmltc/qmltccompiler.cpp
@@ -31,6 +31,8 @@
 #include "qmltccodewriter.h"
 #include <QtCore/qloggingcategory.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQmltcCompiler, "qml.qmltc.compiler", QtWarningMsg);
@@ -192,6 +194,30 @@ void QmltcCompiler::compileType(QmltcType &current, const QQmlJSScope::ConstPtr
                         + u"(creator, engine, QQmlData::get(parent)->outerContext);";
     }
     current.init.body << u"return nullptr;"_qs;
+
+    // compile components of a type:
+    // - enums
+    // - properties
+    // - methods
+    // - bindings
+
+    const auto enums = type->ownEnumerations();
+    current.enums.reserve(enums.size());
+    for (auto it = enums.begin(); it != enums.end(); ++it)
+        compileEnum(current, it.value());
+}
+
+void QmltcCompiler::compileEnum(QmltcType &current, const QQmlJSMetaEnum &e)
+{
+    const auto intValues = e.values();
+    QStringList values;
+    values.reserve(intValues.size());
+    std::transform(intValues.cbegin(), intValues.cend(), std::back_inserter(values),
+                   [](int x) { return QString::number(x); });
+
+    // structure: (C++ type name, enum keys, enum values, MOC line)
+    current.enums.emplaceBack(e.name(), e.keys(), std::move(values),
+                              u"Q_ENUM(%1)"_qs.arg(e.name()));
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qmltc/qmltccompiler.h b/tools/qmltc/qmltccompiler.h
index e59cc116f4..8d2f360d75 100644
--- a/tools/qmltc/qmltccompiler.h
+++ b/tools/qmltc/qmltccompiler.h
@@ -64,6 +64,7 @@ private:
     QmltcCompilerInfo m_info {}; // miscellaneous input/output information
 
     void compileType(QmltcType &current, const QQmlJSScope::ConstPtr &type);
+    void compileEnum(QmltcType &current, const QQmlJSMetaEnum &e);
 
     bool hasErrors() const { return m_logger->hasErrors(); } // TODO: count warnings as errors?
     void recordError(const QQmlJS::SourceLocation &location, const QString &message,
diff --git a/tools/qmltc/qmltcoutputir.h b/tools/qmltc/qmltcoutputir.h
index c299f283a8..067fb1bd43 100644
--- a/tools/qmltc/qmltcoutputir.h
+++ b/tools/qmltc/qmltcoutputir.h
@@ -64,10 +64,11 @@ struct QmltcEnum
     QString cppType; // C++ type of an enum
     QStringList keys; // enumerator keys
     QStringList values; // enumerator values
+    QString ownMocLine; // special MOC line that follows enum declaration
 
     QmltcEnum() = default;
-    QmltcEnum(const QString &t, const QStringList &ks, const QStringList &vs)
-        : cppType(t), keys(ks), values(vs)
+    QmltcEnum(const QString &t, const QStringList &ks, const QStringList &vs, const QString &l)
+        : cppType(t), keys(ks), values(vs), ownMocLine(l)
     {
     }
 };