summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2019-03-21 13:33:35 +0100
committerDominik Holland <dominik.holland@pelagicore.com>2019-04-01 16:17:10 +0000
commitfdb9b87a029e8b32b424a9957d0c04e5f7eb8352 (patch)
tree3909af878619052be0f2e6fcebe4b809d95183fe /tests
parentf550b2304355ac024d8816a3baa5d6336749aee7 (diff)
downloadqtivi-fdb9b87a029e8b32b424a9957d0c04e5f7eb8352.tar.gz
Remove the QtSimulator integration
This removes the QtSimulator code in the autogenerated simulator backends and the control_panel template. The simulation can now be scripted using the QIviSimulationEngine. Change-Id: I40330e9454f700278cbf6ac960f602385642b524 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/core/ivigenerator/ivigenerator.pro3
-rw-r--r--tests/auto/core/ivigenerator/org.example.echo.simulator.qface44
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro15
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro10
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro14
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro13
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro14
-rw-r--r--tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro16
-rw-r--r--tests/auto/core/ivigenerator/projects/projects.pro4
9 files changed, 1 insertions, 132 deletions
diff --git a/tests/auto/core/ivigenerator/ivigenerator.pro b/tests/auto/core/ivigenerator/ivigenerator.pro
index 87b0c0b..2254d04 100644
--- a/tests/auto/core/ivigenerator/ivigenerator.pro
+++ b/tests/auto/core/ivigenerator/ivigenerator.pro
@@ -5,5 +5,4 @@ SUBDIRS = projects
OTHER_FILES = org.example.echo.qface \
org.example.echo.yaml \
org.example.echo.noprivate.qface \
- org.example.echo.qtro.qface \
- org.example.echo.simulator.qface
+ org.example.echo.qtro.qface
diff --git a/tests/auto/core/ivigenerator/org.example.echo.simulator.qface b/tests/auto/core/ivigenerator/org.example.echo.simulator.qface
deleted file mode 100644
index 6b39cd2..0000000
--- a/tests/auto/core/ivigenerator/org.example.echo.simulator.qface
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * module
- */
-module org.example.simulator.echo 1.0
-
-/**
- * \brief the brief
- * the description
- * continues \l http://qt.io
- */
-@config: {"id": "org.foo.id.1.0"}
-interface Echo {
- /**
- * \brief brief message
- *
- * Some more documentation
- */
- readonly string lastMessage;
- int intValue;
- string stringValue;
-
- string echo(string msg);
- string id();
-
- signal valueChanged(int value);
-}
-
-@config: {"id": "org.foo.idz.1.0", "zoned": true}
-interface EchoZoned {
- /**
- * \brief brief message
- *
- * Some more documentation
- */
- readonly string lastMessage;
- int intValue;
- string stringValue;
-
- string echo(string msg);
- string id();
-
- signal valueChanged(int value);
-}
-
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro
deleted file mode 100644
index d62c1f2..0000000
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE=lib
-TARGET = $$qtLibraryTarget(echo_backend_simulator)
-LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_simulator_frontend)
-DESTDIR = ../qtivi
-
-CONFIG += warn_off ivigenerator plugin
-
-INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
-PLUGIN_CLASS_NAME = EchoPlugin
-
-QT += core ivicore
-
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../../../org.example.echo.simulator.qface
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro
deleted file mode 100644
index 8521a23..0000000
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE=app
-TARGET= echo_simulator_control_panel
-DESTDIR = ../
-
-CONFIG += ivigenerator
-
-QT += ivicore ivicore-private qml quick
-
-QFACE_FORMAT = control_panel
-QFACE_SOURCES = ../../../org.example.echo.simulator.qface
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro
deleted file mode 100644
index 130ea15..0000000
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE=lib
-TARGET= $$qtLibraryTarget(echo_simulator_frontend)
-DESTDIR = ../
-
-CONFIG += ivigenerator
-
-QT += ivicore ivicore-private qml quick
-
-DEFINES += QT_BUILD_ORG_EXAMPLE_SIMULATOR_ECHO_LIB
-
-macos: QMAKE_SONAME_PREFIX = @rpath
-
-QFACE_SOURCES = ../../../org.example.echo.simulator.qface
-
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro
deleted file mode 100644
index eeb5bbb..0000000
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = subdirs
-
-QT_FOR_CONFIG += ivicore
-
-SUBDIRS = frontend \
- backend_simulator \
- control_panel \
- validator \
- test
-
-backend_simulator.depends = frontend
-validator.depends = frontend
-test.depends = frontend
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro
deleted file mode 100644
index 89887f5..0000000
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = tst_org-example-echo-simulator
-QMAKE_PROJECT_NAME = $$TARGET
-DESTDIR = ../
-
-QT += testlib core ivicore
-CONFIG += c++11 ivigenerator testcase
-
-INCLUDEPATH += $$OUT_PWD/../frontend
-LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_simulator_frontend)
-
-QMAKE_RPATHDIR += $$OUT_PWD/..
-
-QFACE_FORMAT = test
-QFACE_SOURCES = ../../../org.example.echo.simulator.qface
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro
deleted file mode 100644
index fccb3c6..0000000
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = app
-TARGET = validator_org-example-echo-simulator
-QMAKE_PROJECT_NAME = $$TARGET
-LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_simulator_frontend)
-
-DESTDIR = ..
-
-CONFIG += c++11 ivigenerator
-CONFIG -= app_bundle
-
-INCLUDEPATH += $$OUT_PWD/../frontend
-
-QT += qml quick core ivicore
-
-QFACE_FORMAT = generation_validator
-QFACE_SOURCES = ../../../org.example.echo.simulator.qface
diff --git a/tests/auto/core/ivigenerator/projects/projects.pro b/tests/auto/core/ivigenerator/projects/projects.pro
index cc11805..66ea031 100644
--- a/tests/auto/core/ivigenerator/projects/projects.pro
+++ b/tests/auto/core/ivigenerator/projects/projects.pro
@@ -8,7 +8,3 @@ SUBDIRS = org-example-echo \
qtConfig(remoteobjects) {
SUBDIRS += org-example-echo-qtro
}
-
-qtConfig(simulator) {
- SUBDIRS += org-example-echo-simulator
-}