diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-09-06 15:33:41 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-09-14 13:01:54 +0000 |
| commit | 4f2ed050580004734cb072b26ec2cb1f876e0d6e (patch) | |
| tree | 0fd0b09e1bd97a84b89d4a7d0c8d45734e09e2b4 /tests | |
| parent | d87d7161a9267c33990a8fb172310e4ade291c13 (diff) | |
| download | qtivi-4f2ed050580004734cb072b26ec2cb1f876e0d6e.tar.gz | |
Build-system cleanup
Fix PLUGIN_CLASS_NAME in all places and remove PLUGIN_EXTENDS
where it is not needed.
For all plugins which are provided with the modules, fix the
PLUGIN_EXTENDS to match the module name to also deliver the cmake
file for these plugins.
Renamed the MprisPlugin class name to not clash with the normal
plugin name, as this is also used for the cmake filename.
This should also fix build errors when trying to create the cmake
files in non-existent folders.
Change-Id: I102019fab327273903c8c378595c06a25964cfe8
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'tests')
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro index 9cfc036..c3ac195 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/backend_simulator.pro @@ -7,8 +7,7 @@ CONFIG += warn_off ivigenerator plugin INCLUDEPATH += $$OUT_PWD/../frontend PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = qtivi -PLUGIN_CLASS_NAME = QIviServiceInterface +PLUGIN_CLASS_NAME = EchoPlugin QT += core ivicore diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro index a0093b7..0bf0ee3 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro @@ -7,8 +7,7 @@ CONFIG += warn_off ivigenerator plugin INCLUDEPATH += $$OUT_PWD/../frontend PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = qtivi -PLUGIN_CLASS_NAME = QIviServiceInterface +PLUGIN_CLASS_NAME = EchoPlugin QT += core ivicore 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 index 0264f84..d62c1f2 100644 --- 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 @@ -7,8 +7,7 @@ CONFIG += warn_off ivigenerator plugin INCLUDEPATH += $$OUT_PWD/../frontend PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = qtivi -PLUGIN_CLASS_NAME = QIviServiceInterface +PLUGIN_CLASS_NAME = EchoPlugin QT += core ivicore diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.pro index e1bdc6d..9922d05 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.pro @@ -7,8 +7,7 @@ CONFIG += warn_off ivigenerator plugin INCLUDEPATH += $$OUT_PWD/../frontend PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = qtivi -PLUGIN_CLASS_NAME = QIviServiceInterface +PLUGIN_CLASS_NAME = EchoPlugin QT += core ivicore |