diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-01-31 11:50:56 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-02-15 10:51:30 +0000 |
| commit | 54353d822f77f63dd57ce88640135cd9e0bbbc8a (patch) | |
| tree | 0af3d484b3f3466aadc6d273a6d956f2fca040dd /src/tools/ivigenerator/templates_frontend | |
| parent | 906ae2192e55aa6bdf251ec120b54016bc9e2477 (diff) | |
ivigenerator: Don't hardcode the QML module version
Instead use the module version from the qface file
Change-Id: I99f8e571b63149871c5164a4eea90291ce4f4f90
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/tools/ivigenerator/templates_frontend')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/ivigenerator/templates_frontend/interface.h.tpl b/src/tools/ivigenerator/templates_frontend/interface.h.tpl index e972f32..89f43e0 100644 --- a/src/tools/ivigenerator/templates_frontend/interface.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/interface.h.tpl @@ -89,7 +89,7 @@ public: {% endif %} ~{{class}}(); - static void registerQmlTypes(const QString& uri, int majorVersion=1, int minorVersion=0); + static void registerQmlTypes(const QString& uri, int majorVersion={{interface.module.majorVersion}}, int minorVersion={{interface.module.minorVersion}}); {% for property in interface.properties %} {{ivi.prop_getter(property)}}; diff --git a/src/tools/ivigenerator/templates_frontend/module.h.tpl b/src/tools/ivigenerator/templates_frontend/module.h.tpl index 706d68f..ba37e4d 100644 --- a/src/tools/ivigenerator/templates_frontend/module.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/module.h.tpl @@ -77,7 +77,7 @@ public: {% endfor %} static void registerTypes(); - static void registerQmlTypes(const QString& uri = QStringLiteral("{{module|qml_type}}"), int majorVersion = 1, int minorVersion = 0); + static void registerQmlTypes(const QString& uri = QStringLiteral("{{module|qml_type}}"), int majorVersion = {{module.majorVersion}}, int minorVersion = {{module.minorVersion}}); }; {% for enum in module.enums %} diff --git a/src/tools/ivigenerator/templates_frontend/plugins.qmltypes.tpl b/src/tools/ivigenerator/templates_frontend/plugins.qmltypes.tpl index 7984d6b..cbe086c 100644 --- a/src/tools/ivigenerator/templates_frontend/plugins.qmltypes.tpl +++ b/src/tools/ivigenerator/templates_frontend/plugins.qmltypes.tpl @@ -58,7 +58,7 @@ Module { Component { name: "{{class}}" prototype: "{{base_class}}" - exports: ["{{module|qml_type}}/{{interface|qml_type}} 1.0"] + exports: ["{{module|qml_type}}/{{interface|qml_type}} {{module.majorVersion}}.{{module.minorVersion}}"] exportMetaObjectRevisions: [0] {% for property in interface.properties %} {% if property.readonly or property.const or property.type.is_model %} @@ -106,7 +106,7 @@ Module { Component { name: "{{module.module_name|upperfirst}}Module" prototype: "QObject" - exports: ["{{module|qml_type}}/{{module_qml_name}} 1.0"] + exports: ["{{module|qml_type}}/{{module_qml_name}} {{module.majorVersion}}.{{module.minorVersion}}"] isCreatable: false isSingleton: true exportMetaObjectRevisions: [0] |