diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-01-09 11:38:36 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-01-10 14:27:30 +0000 |
| commit | f95c17d81d1f939479665627601f77094e7aa4e4 (patch) | |
| tree | fff781e85371e1fd424e65014c7b9f57ef18aeb9 | |
| parent | 7a52f22258eabc31249028e64d0d62311395040c (diff) | |
ivigenerator: Fix the backend_qtro template to generate a correct plugin.json
The other templates have been fixed already before. Also make sure
the example doesn't specify a custom id to make sure we test this path
by default.
Change-Id: Icf4eb17c057ea8cba7673b9884c5123c4e749ffd
Fixes: AUTOSUITE-735
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | examples/ivicore/qface-ivi-remote/example-ivi-remote.qface | 2 | ||||
| -rw-r--r-- | src/tools/ivigenerator/templates_backend_qtro/plugin.json | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface b/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface index af45423..31d6d0c 100644 --- a/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface +++ b/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface @@ -9,7 +9,7 @@ module Example.IVI.Remote 1.0; * all sorts of heavy processing */ //! [1] -@config: { id: "example.qtivi.ProcessingService/1.0", qml_type: "UiProcessingService" } +@config: { qml_type: "UiProcessingService" } interface ProcessingService { string lastMessage; diff --git a/src/tools/ivigenerator/templates_backend_qtro/plugin.json b/src/tools/ivigenerator/templates_backend_qtro/plugin.json index cbe79a6..b205459 100644 --- a/src/tools/ivigenerator/templates_backend_qtro/plugin.json +++ b/src/tools/ivigenerator/templates_backend_qtro/plugin.json @@ -40,10 +40,11 @@ { "interfaces" : [ {% for interface in module.interfaces %} +{% set iid=interface.qualified_name %} {% if 'config' in interface.tags and 'id' in interface.tags.config %} - "{{interface.tags.config.id}}"{% if not loop.last %}, - {%endif%} -{% endif%} +{% set iid=interface.tags.config.id %} +{% endif %} + "{{iid}}"{% if not loop.last %},{%endif%} {% endfor%} ] } |