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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 65c497e..74cac03 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -30,6 +30,10 @@ QFACE_BASE_NAME = $$replace(QFACE_FILE, .qface, ) QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml OTHER_FILES += $$QFACE_FILE +# The 'click' library used by the generator needs to have a utf8 locale setup. +win32: ENV = chcp 65001 && +else: ENV = LC_ALL="en_US.UTF-8" + # Detect whether we are using the feature inside the qtivi repository VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv INTERNAL_VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv @@ -40,20 +44,15 @@ QTEST_ENVIRONMENT = $$upper($$(QTEST_ENVIRONMENT)) # Because of the two stage build of COIN, it might not exist, but the installed version should still be there !isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI):!qtConfig(system-ivigenerator) { VIRTUALENV_PATH = $$INTERNAL_VIRTUALENV_PATH -} - -!isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI):!qtConfig(system-ivigenerator) { IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator + win32: ENV += set IVIGENERATOR_CONFIG="$$shell_path($$QTIVI_BUILD_ROOT/src/tools/ivigenerator/.config)" && + else: ENV += IVIGENERATOR_CONFIG="$$shell_path($$QTIVI_BUILD_ROOT/src/tools/ivigenerator/.config)" } win32: VIRTUALENV_PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe else: VIRTUALENV_PYTHON = $$VIRTUALENV_PATH/bin/python IVI_GENERATOR = $$VIRTUALENV_PYTHON $$IVI_GENERATOR_PATH/generate.py -# The 'click' library used by the generator needs to have a utf8 locale setup. -win32: ENV = chcp 65001 && -else: ENV = LC_ALL="en_US.UTF-8" - # TODO make this work with multiple input files, or only support one QFACE_SOURCE # Although this could be extra_compiler it is a normal EXTRA_TARGET for a reason. # In the debug_and_release configuration, we want to have the generator executed |