diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-02-04 15:11:40 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-02-15 10:51:34 +0000 |
commit | 4c3c3a1f6f19d3f17bb4b046a7b7b2c419fd548f (patch) | |
tree | c40774f847d6045a77266047019805f002f0de26 | |
parent | 54353d822f77f63dd57ce88640135cd9e0bbbc8a (diff) | |
download | qtivi-4c3c3a1f6f19d3f17bb4b046a7b7b2c419fd548f.tar.gz |
ivigenerator: Also use the qml_types filter for the uri of the simluation engine
By also using the qml_types filter here, we make sure that the uri for the simulation
is similar to the frontend API. (It just adds a extra .simulation at the end).
Also juse the qface module version in the autogenerated QML API
Change-Id: I4804302a18f7af93345a905c79dd86b00c77702b
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
7 files changed, 8 insertions, 8 deletions
diff --git a/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml b/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml index 73806c0..7aed660 100644 --- a/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml +++ b/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml @@ -53,7 +53,7 @@ //! [0] import QtQuick 2.0 -import example.ivi.addressbook.simulation 1.0 +import Example.IVI.AddressBook.simulation 1.0 Item { AddressBookBackend { diff --git a/src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml b/src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml index 018b03d..d0f2bde 100644 --- a/src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml +++ b/src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml @@ -41,7 +41,7 @@ ****************************************************************************/ import QtQuick 2.0 -import qtivivehiclefunctions.simulation 1.0 +import QtIvi.VehicleFunctions.simulation 1.0 QtObject { property var settings : IviSimulator.findData(IviSimulator.simulationData, "QIviWindowControl") diff --git a/src/plugins/ivivehiclefunctions/simulation.qml b/src/plugins/ivivehiclefunctions/simulation.qml index ee90f38..e1e67f6 100644 --- a/src/plugins/ivivehiclefunctions/simulation.qml +++ b/src/plugins/ivivehiclefunctions/simulation.qml @@ -41,7 +41,7 @@ ****************************************************************************/ import QtQuick 2.0 -import qtivivehiclefunctions.simulation 1.0 +import QtIvi.VehicleFunctions.simulation 1.0 QtObject { property var qiviclimatecontrol : QIviClimateControlSimulation { diff --git a/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl b/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl index 7ff9502..376a8eb 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl @@ -125,7 +125,7 @@ QT_BEGIN_NAMESPACE {% if property.type.is_model %} auto {{ property }}Model = (new {{property|upperfirst}}ModelBackend(this)); m_{{ property }} = {{ property }}Model; - engine->registerSimulationInstance({{ property }}Model, "{{module.name|lower}}.simulation", 1, 0, "{{property|upperfirst}}ModelBackend"); + engine->registerSimulationInstance({{ property }}Model, "{{module|qml_type}}.simulation", {{module.majorVersion}}, {{module.minorVersion}}, "{{property|upperfirst}}ModelBackend"); {% endif %} {% endif %} {% endfor %} diff --git a/src/tools/ivigenerator/templates_backend_simulator/backend.qml.tpl b/src/tools/ivigenerator/templates_backend_simulator/backend.qml.tpl index f1af03f..f91d7bd 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/backend.qml.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/backend.qml.tpl @@ -39,7 +39,7 @@ #} import QtQuick 2.0 -import {{module.name|lower}}.simulation 1.0 +import {{module|qml_type}}.simulation {{module.majorVersion}}.{{module.minorVersion}} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.cpp.tpl b/src/tools/ivigenerator/templates_backend_simulator/plugin.cpp.tpl index 619e57a..f4f1be9 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/plugin.cpp.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/plugin.cpp.tpl @@ -73,8 +73,8 @@ extern {{class}}::InterfaceBuilder {{module.tags.config.interfaceBuilder}}; {% for interface in module.interfaces %} auto {{interface}}Instance = new {{interface}}Backend(m_simulationEngine, this); //Register the types for the SimulationEngine - {{module.module_name|upperfirst}}Module::registerQmlTypes(QStringLiteral("{{module.name|lower}}.simulation"), 1, 0); - m_simulationEngine->registerSimulationInstance({{interface}}Instance, "{{module.name|lower}}.simulation", 1, 0, "{{interface}}Backend"); + {{module.module_name|upperfirst}}Module::registerQmlTypes(QStringLiteral("{{module|qml_type}}.simulation"), {{module.majorVersion}}, {{module.minorVersion}}); + m_simulationEngine->registerSimulationInstance({{interface}}Instance, "{{module|qml_type}}.simulation", {{module.majorVersion}}, {{module.minorVersion}}, "{{interface}}Backend"); m_interfaces << {{interface}}Instance; {% endfor %} {% if module.tags.config_simulator and module.tags.config_simulator.simulationFile %} diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.qml.tpl b/src/tools/ivigenerator/templates_backend_simulator/plugin.qml.tpl index c689511..ff558d8 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/plugin.qml.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/plugin.qml.tpl @@ -39,7 +39,7 @@ #} import QtQuick 2.0 -import {{module.name|lower}}.simulation 1.0 +import {{module|qml_type}}.simulation {{module.majorVersion}}.{{module.minorVersion}} QtObject { {% for iface in module.interfaces %} |