From 95a3a3f12de4c49d4913e0f2d8924c3fa57ad1e2 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 11 Oct 2019 16:29:51 +0200 Subject: ivigenerator: Remove the generation_validator template This template is still from the early days before the auto test template existed. As the autotests make sure the auto generated code works as intended, this feature is not needed anymore. Change-Id: Id0f0b5ccf42678e42abba924e65eaf27ed6d754e Reviewed-by: Robert Griebl --- .../org-example-echo-noannotation.pro | 2 -- .../validator/validator.pro | 16 ---------------- .../org-example-echo-noprivate.pro | 2 -- .../org-example-echo-noprivate/validator/validator.pro | 17 ----------------- .../projects/org-example-echo/org-example-echo.pro | 2 -- .../projects/org-example-echo/validator/validator.pro | 16 ---------------- 6 files changed, 55 deletions(-) delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/validator/validator.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/validator/validator.pro delete mode 100644 tests/auto/core/ivigenerator/projects/org-example-echo/validator/validator.pro (limited to 'tests') diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro index 993ce2a..bd2e628 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/org-example-echo-noannotation.pro @@ -3,11 +3,9 @@ TEMPLATE = subdirs SUBDIRS = frontend \ qmlplugin \ backend_simulator \ - validator \ test \ backend_simulator.depends = frontend -validator.depends = frontend test.depends = frontend qmlplugin.depends = frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/validator/validator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/validator/validator.pro deleted file mode 100644 index 09ec4d1..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/validator/validator.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = validator_org-example-echo-noannotation -QMAKE_PROJECT_NAME = $$TARGET -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_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.noannotation.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 c751801..0967ee4 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 @@ -5,10 +5,8 @@ QT_FOR_CONFIG += ivicore SUBDIRS = frontend \ qmlplugin \ backend_simulator \ - validator \ test backend_simulator.depends = frontend -validator.depends = frontend test.depends = frontend qmlplugin.depends = frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/validator/validator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/validator/validator.pro deleted file mode 100644 index 016c77d..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/validator/validator.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app -TARGET = validator_org-example-echo-noprivate -QMAKE_PROJECT_NAME = $$TARGET -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noprivate_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.qface -QFACE_ANNOTATIONS += ../../../no-private.yaml diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/org-example-echo.pro b/tests/auto/core/ivigenerator/projects/org-example-echo/org-example-echo.pro index 38be75d..f6f762c 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/org-example-echo.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/org-example-echo.pro @@ -3,10 +3,8 @@ TEMPLATE = subdirs SUBDIRS = frontend \ qmlplugin \ backend_simulator \ - validator \ test \ backend_simulator.depends = frontend -validator.depends = frontend test.depends = frontend qmlplugin.depends = frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/validator/validator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo/validator/validator.pro deleted file mode 100644 index 122db41..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/validator/validator.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = validator_org-example-echo -QMAKE_PROJECT_NAME = $$TARGET -LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_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.qface -- cgit v1.2.1