aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-08-23 14:10:40 +0200
committerRobert Griebl <robert.griebl@pelagicore.com>2017-09-19 12:49:49 +0000
commit88859769f2a06b2fa8502ea758814788c2f619f0 (patch)
tree4a8afbdd9141f79d19875e1d41ef3d8490037190 /tests
parent15d18418fd87db4a93a0859952dcec92a1586b81 (diff)
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 'tests')
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro
index 84e7275..8922ad6 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro
@@ -1,9 +1,14 @@
TEMPLATE = subdirs
+QT_FOR_CONFIG += ivicore
+
SUBDIRS = frontend \
backend_simulator \
- validator \
- control_panel \
+ validator
+
+qtConfig(simulator) {
+ SUBDIRS += control_panel
+}
backend_simulator.depends = frontend
validator.depends = frontend