diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-08-23 14:10:40 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-09-19 12:49:49 +0000 |
| commit | 88859769f2a06b2fa8502ea758814788c2f619f0 (patch) | |
| tree | 4a8afbdd9141f79d19875e1d41ef3d8490037190 /src/tools/ivigenerator/ivigenerator.pro | |
| parent | 15d18418fd87db4a93a0859952dcec92a1586b81 (diff) | |
| download | qtivi-88859769f2a06b2fa8502ea758814788c2f619f0.tar.gz | |
Integrate qtsimulator support for the control_panel
The control_panel acts as a server and the backend connects to
it. Once a connection is established the control_panel will push
it's initial values to the backend and from there all properties
and signals are synchronized.
Currently only one connection is supported.
The qtsimulator support is detected during configure time
and based on that the new "simulator" feature is enabled.
The ivigenerator now has a configuration file, which is used
to define which features it supports. This is used to be
able to generate qtsimulator support into the simulation backends
only if the qtsimulator is available and the feature is enabled.
Task-number: QTAUTO-441
Task-number: QTAUTO-442
Change-Id: I5045d21f92176fed7d9025850b70f4759c9232c2
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/tools/ivigenerator/ivigenerator.pro')
| -rw-r--r-- | src/tools/ivigenerator/ivigenerator.pro | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/src/tools/ivigenerator/ivigenerator.pro b/src/tools/ivigenerator/ivigenerator.pro index 15edf97..e56bc41 100644 --- a/src/tools/ivigenerator/ivigenerator.pro +++ b/src/tools/ivigenerator/ivigenerator.pro @@ -1,5 +1,7 @@ TEMPLATE = aux +QT_FOR_CONFIG += ivicore + !contains(CONFIG, no_internal_qface): include(qface_internal_build.pri) # Make sure to only build this once in a debug_and_release config @@ -71,13 +73,19 @@ templates_control_panel.path = $$[QT_HOST_BINS]/ivigenerator/templates_control_p generator.files += \ generate.py \ + $$OUT_PWD/.config \ templates_frontend.yaml \ templates_backend_simulator.yaml \ templates_generation_validator.yaml \ - templates_control_panel.yaml + generator.path = $$[QT_HOST_BINS]/ivigenerator -INSTALLS += templates_frontend templates_backend_simulator templates_generation_validator templates_control_panel generator +qtConfig(simulator) { + generator.files += templates_control_panel.yaml + INSTALLS += templates_control_panel +} + +INSTALLS += templates_frontend templates_backend_simulator templates_generation_validator generator # Ensure files are installed to qtbase for non-prefixed builds !force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { @@ -93,3 +101,21 @@ INSTALLS += templates_frontend templates_backend_simulator templates_generation_ QMAKE_EXTRA_COMPILERS += $${install_target}_copy } } + +defineTest(createConfig) { + write_file($$OUT_PWD/.config, $$list("---")) + for(var, ARGS) { + isEmpty($$var):out = "$$var: ~" + else:count($$var, 1):out = "$$var: \"$$first($$var)\"" + else { + out = "$$var:" + for(val, $$var):out += " - \"$$val\"" + out=$$join(out, "$$escape_expand(\\n)") + } + write_file($$OUT_PWD/.config, out, append) + } +} + +VERSION = $$MODULE_VERSION +FEATURES = $${QT.ivicore.enabled_features} +createConfig(VERSION, FEATURES) |