diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-29 10:32:26 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-19 08:36:04 +0200 |
commit | 19ea4e630c70cdab1f7eec4f1a8f278df8915720 (patch) | |
tree | cb5ad929688d5eb5becd74964862db6127b857af /tools/qmlplugindump | |
parent | d29f3d7a62780d74f62330b0e3a0703a72155852 (diff) |
Clean up registration of QEasingCurve
We don't need to register the Type enum for both QtQml and QtQuick.
QtQml is enough. Removing this makes the whole manual value type
registration obsolete. Furthermore, we want QEasingCurve as QML_FOREIGN
as we have several classes with properties of that type. To keep it nice
and tidy, we make the uppercase-named enum holder class a separate type.
Unfortunately, the Type enums differ in one entry:
QEasingCurve::BezierSpline is called Easing.Bezier in QML. Therefore, we
need to keep the custom enum around. We can change all users in
qtdeclarative to use the name from QEasingCurve, though.
Change-Id: Ibbc78d8bbf8938e2a8722f8c09833a0c73394c3d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmlplugindump')
-rw-r--r-- | tools/qmlplugindump/main.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 3efa4dc605..0aa163707c 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -642,14 +642,6 @@ public: qml->writeEndObject(); } - void writeEasingCurve() - { - qml->writeStartObject(QLatin1String("Component")); - qml->writeScriptBinding(QLatin1String("name"), enquote(QLatin1String("QEasingCurve"))); - qml->writeScriptBinding(QLatin1String("prototype"), enquote(QLatin1String("QQmlEasingValueType"))); - qml->writeEndObject(); - } - private: /* Removes pointer and list annotations from a type name, returning @@ -1337,7 +1329,6 @@ int main(int argc, char *argv[]) // setup static rewrites of type names cppToId.insert("QString", "string"); - cppToId.insert("QQmlEasingValueType::Type", "Type"); // start dumping data QByteArray bytes; @@ -1381,11 +1372,6 @@ int main(int argc, char *argv[]) for (; iter != compositeTypes.constEnd(); ++iter) dumper.dumpComposite(&engine, iter.value(), info); - // define QEasingCurve as an extension of QQmlEasingValueType, this way - // properties using the QEasingCurve type get useful type information. - if (pluginImportUri.isEmpty()) - dumper.writeEasingCurve(); - // Insert merge file. qml.write(mergeComponents); |