diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-06 10:16:25 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-15 12:49:04 +0000 |
commit | bbcd4571dbc30b8d660d81b66afae19e9dac615c (patch) | |
tree | 7d5f1a9decb0756f2cc2937c4a39b5aa88477c1c /tests | |
parent | c99b4539534a09e0da836b5dd5057e8b770e9863 (diff) | |
download | qtivi-bbcd4571dbc30b8d660d81b66afae19e9dac615c.tar.gz |
Add the control_panel to the autogenerator tests
Fixed it to make it work also for unzoned interfaces and fixed a issue
when no qml_name is set for the interface, which caused the QML and
the C++ backend to have the same name and cause weird issues.
Change-Id: I0d90fb56b60ff17eb37b41412c1d33a8e628df43
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/core/ivigenerator/ivigenerator.pro b/tests/auto/core/ivigenerator/ivigenerator.pro index b368853..dfc1c66 100644 --- a/tests/auto/core/ivigenerator/ivigenerator.pro +++ b/tests/auto/core/ivigenerator/ivigenerator.pro @@ -1,3 +1,7 @@ TEMPLATE = subdirs SUBDIRS = projects + +OTHER_FILES = org.example.echo.qface \ + org.example.echo.yaml \ + org.example.echo.noprivate.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/control_panel/control_panel.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/control_panel/control_panel.pro new file mode 100644 index 0000000..029b372 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/control_panel/control_panel.pro @@ -0,0 +1,10 @@ +TEMPLATE=app +TARGET= echo_noprivate_control_panel +DESTDIR = ../ + +CONFIG += ivigenerator + +QT += ivicore ivicore-private qml quick + +QFACE_FORMAT = control_panel +QFACE_SOURCES = ../../../org.example.echo.noprivate.qface 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 7083d85..84e7275 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 @@ -3,6 +3,7 @@ TEMPLATE = subdirs SUBDIRS = frontend \ backend_simulator \ validator \ + control_panel \ backend_simulator.depends = frontend validator.depends = frontend |