diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-12 14:46:08 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-12 14:50:46 +0200 |
| commit | 242d28afcc60728b3ae30bb3ce2a3362b26fb57b (patch) | |
| tree | 744c905eabe6e697b4bb71fc96d4b4826e8bf522 | |
| parent | 346c7aea64f1cdee06cdee4b7ffb1cfb63b67fb2 (diff) | |
ivigenerator: Add a '_simulation' as the postfix for the generated resource files
Generating a file called "main.qrc" has some strange side effects during
compilation. Making sure the file has a postfix circumvents this.
Change-Id: I2a2bce686154e2659df997a0f3e09a6bfbd571d7
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
4 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/ivigenerator/templates_backend_simulator.yaml b/src/tools/ivigenerator/templates_backend_simulator.yaml index 889a0e6..4c47848 100644 --- a/src/tools/ivigenerator/templates_backend_simulator.yaml +++ b/src/tools/ivigenerator/templates_backend_simulator.yaml @@ -10,7 +10,7 @@ generate_rules: template_file: "plugin.json" - dest_file: "{{module.module_name|lower}}_simulation_data.json" template_file: "common/simulation_data.json.tpl" - - dest_file: "{{module.module_name|lower}}.qrc" + - dest_file: "{{module.module_name|lower}}_simulation.qrc" template_file: "common/simulation.qrc.tpl" - dest_file: "{{srcBase|lower}}.pri" template_file: "plugin.pri.tpl" diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.pri.tpl b/src/tools/ivigenerator/templates_backend_simulator/plugin.pri.tpl index 172e4cd..2ad5932 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/plugin.pri.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/plugin.pri.tpl @@ -58,7 +58,7 @@ SOURCES += \ {% endfor %} $$PWD/{{module.module_name|lower}}plugin.cpp -RESOURCES += $$PWD/{{module.module_name|lower}}.qrc +RESOURCES += $$PWD/{{module.module_name|lower}}_simulation.qrc OTHER_FILES += \ $$PWD/{{module.module_name|lower}}.json \ diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator.yaml b/src/tools/ivigenerator/templates_server_qtro_simulator.yaml index d381b0d..5f7ab45 100644 --- a/src/tools/ivigenerator/templates_server_qtro_simulator.yaml +++ b/src/tools/ivigenerator/templates_server_qtro_simulator.yaml @@ -14,7 +14,7 @@ generate_rules: template_file: "common/module_simulation.qml.tpl" - dest_file: "{{module.module_name|lower}}_simulation_data.json" template_file: "common/simulation_data.json.tpl" - - dest_file: "{{module.module_name|lower}}.qrc" + - dest_file: "{{module.module_name|lower}}_simulation.qrc" template_file: "common/simulation.qrc.tpl" - dest_file: "qml/{{module|qml_type|replace('.', '/')}}/simulation/plugins.qmltypes" template_file: "common/simulation.qmltypes.tpl" diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/server.pri.tpl b/src/tools/ivigenerator/templates_server_qtro_simulator/server.pri.tpl index 0413329..b126fd6 100644 --- a/src/tools/ivigenerator/templates_server_qtro_simulator/server.pri.tpl +++ b/src/tools/ivigenerator/templates_server_qtro_simulator/server.pri.tpl @@ -64,7 +64,7 @@ REPC_SOURCE += \ $$PWD/{{interface|lower}}.rep \ {% endfor %} -RESOURCES += $$PWD/{{module.module_name|lower}}.qrc +RESOURCES += $$PWD/{{module.module_name|lower}}_simulation.qrc OTHER_FILES += \ $$PWD/{{module.module_name|lower}}.json \ |