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>

14 files changed, 23 insertions, 28 deletions

diff --git a/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro
index 14ed034..76974e5 100644
--- a/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro
+++ b/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro
@@ -15,7 +15,6 @@ CONFIG += ivigenerator plugin
 QFACE_FORMAT = backend_simulator
 QFACE_SOURCES = ../example-ivi-addressbook.qface
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
 PLUGIN_CLASS_NAME = AddressBookPlugin
 
 CONFIG += install_ok  # Do not cargo-cult this!
diff --git a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro
index 53dd135..42f0193 100644
--- a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro
+++ b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro
@@ -19,7 +19,6 @@ CONFIG += ivigenerator plugin
 QFACE_FORMAT = backend_simulator
 QFACE_SOURCES = ../example-ivi-climate.qface
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
 PLUGIN_CLASS_NAME = ClimatePlugin
 #! [2]
 CONFIG += install_ok  # Do not cargo-cult this!
diff --git a/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro b/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro
index 5d790d6..ff26393 100644
--- a/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro
+++ b/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro
@@ -19,7 +19,6 @@ CONFIG += ivigenerator plugin
 QFACE_FORMAT = backend_qtro
 QFACE_SOURCES = ../example-ivi-remote.qface
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
 PLUGIN_CLASS_NAME = RemoteClientPlugin
 #! [2]
 CONFIG += install_ok  # Do not cargo-cult this!
diff --git a/src/ivicore/ivicore.pro b/src/ivicore/ivicore.pro
index 55ca600..ab74365 100644
--- a/src/ivicore/ivicore.pro
+++ b/src/ivicore/ivicore.pro
@@ -19,6 +19,8 @@ DISTFILES += \
 
 CMAKE_MODULE_TESTS = '-'
 
+MODULE_PLUGIN_TYPES = qtivi
+
 HEADERS += \
     qiviservicemanager.h \
     qiviserviceinterface.h \
@@ -83,3 +85,4 @@ include(queryparser/queryparser.pri)
 
 load(qt_module)
 QMAKE_DOCS_TARGETDIR = qtivi
+
diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.pro b/src/plugins/ivimedia/media_simulator/media_simulator.pro
index 70ad2e0..1fa1f1c 100644
--- a/src/plugins/ivimedia/media_simulator/media_simulator.pro
+++ b/src/plugins/ivimedia/media_simulator/media_simulator.pro
@@ -2,8 +2,8 @@ TARGET = media_simulator
 QT_FOR_CONFIG += ivimedia-private
 
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
-PLUGIN_CLASS_NAME = QIviServiceInterface
+PLUGIN_EXTENDS = ivimedia
+PLUGIN_CLASS_NAME = MediaPlugin
 
 QT       += core ivicore ivimedia sql multimedia
 
diff --git a/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro b/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro
index e3d8aee..e2cd5a7 100644
--- a/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro
+++ b/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro
@@ -2,8 +2,8 @@ TARGET = media_simulator_mpris
 QT_FOR_CONFIG += ivimedia-private
 
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
-PLUGIN_CLASS_NAME = QIviServiceInterface
+PLUGIN_EXTENDS = ivimedia
+PLUGIN_CLASS_NAME = MPrisMediaPlugin
 
 QT += core ivicore ivimedia dbus
 
diff --git a/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.cpp b/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.cpp
index 50f56ad..cafecf2 100644
--- a/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.cpp
+++ b/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.cpp
@@ -49,20 +49,20 @@
 
 #include "mediaplayer2_interface.h"
 
-MediaPlugin::MediaPlugin(QObject *parent)
+MPrisMediaPlugin::MPrisMediaPlugin(QObject *parent)
     : QObject(parent)
 {
     m_player = new MediaPlayerBackend(QStringLiteral("org.mpris.MediaPlayer2.vlc"), QDBusConnection::sessionBus(), this);
 }
 
-QStringList MediaPlugin::interfaces() const
+QStringList MPrisMediaPlugin::interfaces() const
 {
     QStringList list;
     list << QStringLiteral(QIviMediaPlayer_iid);
     return list;
 }
 
-QIviFeatureInterface *MediaPlugin::interfaceInstance(const QString &interface) const
+QIviFeatureInterface *MPrisMediaPlugin::interfaceInstance(const QString &interface) const
 {
     if (interface == QLatin1String(QIviMediaPlayer_iid))
         return m_player;
diff --git a/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.h b/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.h
index f5a873c..0240e3b 100644
--- a/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.h
+++ b/src/plugins/ivimedia/media_simulator_mpris/mediaplugin.h
@@ -39,22 +39,21 @@
 **
 ****************************************************************************/
 
-
-#ifndef MEDIAPLUGIN_H
-#define MEDIAPLUGIN_H
+#ifndef MPRISMEDIAPLUGIN_H
+#define MPRISMEDIAPLUGIN_H
 
 #include <QtIviCore/QIviServiceInterface>
 
 class MediaPlayerBackend;
 
-class MediaPlugin : public QObject, QIviServiceInterface
+class MPrisMediaPlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "media_simulator_mpris.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    explicit MediaPlugin(QObject *parent = nullptr);
+    explicit MPrisMediaPlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const override;
     QIviFeatureInterface *interfaceInstance(const QString &interface) const override;
@@ -63,4 +62,4 @@ private:
     MediaPlayerBackend *m_player;
 };
 
-#endif // MEDIAPLUGIN_H
+#endif // MPRISMEDIAPLUGIN_H
diff --git a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro
index d11e77d..5c44c49 100644
--- a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro
+++ b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro
@@ -1,8 +1,8 @@
 TARGET = tuner_simulator
 
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
-PLUGIN_CLASS_NAME = QIviServiceInterface
+PLUGIN_EXTENDS = ivimedia
+PLUGIN_CLASS_NAME = TunerPlugin
 
 QT       += core ivicore ivimedia
 
diff --git a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
index 55cf52f..38d8edc 100644
--- a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
+++ b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
@@ -21,7 +21,7 @@ OTHER_FILES += \
     $$PWD/doc/src/*.qdoc
 
 PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
-PLUGIN_CLASS_NAME = QIviClimateControlBackendInterface
+PLUGIN_EXTENDS = ivivehiclefunctions
+PLUGIN_CLASS_NAME = QtIviVehicleFunctionsPlugin
 
 load(qt_plugin)
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