diff options
Diffstat (limited to 'src/plugins')
27 files changed, 35 insertions, 16 deletions
diff --git a/src/plugins/decorations/bradient/bradient.pro b/src/plugins/decorations/bradient/bradient.pro index 843149e0..e3157678 100644 --- a/src/plugins/decorations/bradient/bradient.pro +++ b/src/plugins/decorations/bradient/bradient.pro @@ -8,4 +8,5 @@ SOURCES += main.cpp QMAKE_USE += wayland-client PLUGIN_TYPE = wayland-decoration-client +PLUGIN_CLASS_NAME = QWaylandBradientDecorationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro index 550343cf..c2e9ad4f 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = wayland-graphics-integration-client +PLUGIN_CLASS_NAME = QWaylandBrcmEglClientBufferPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro index 29a48c9e..2fba5bd1 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro +++ b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro @@ -11,4 +11,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = wayland-graphics-integration-client +PLUGIN_CLASS_NAME = DrmEglServerBufferPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro index d7bf0370..3193b8f6 100644 --- a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = wayland-graphics-integration-client +PLUGIN_CLASS_NAME = LibHybrisEglServerBufferPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro index 076b6af2..d85c5efa 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = wayland-graphics-integration-client +PLUGIN_CLASS_NAME = QWaylandEglClientBufferPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro index 031d2812..c8734084 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro @@ -11,4 +11,5 @@ SOURCES += \ main.cpp PLUGIN_TYPE = wayland-graphics-integration-client +PLUGIN_CLASS_NAME = QWaylandXCompositeEglClientBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro index eb8e03c7..fb5ad15f 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro @@ -8,4 +8,5 @@ SOURCES += \ main.cpp PLUGIN_TYPE = wayland-graphics-integration-client +PLUGIN_CLASS_NAME = QWaylandXCompositeGlxClientBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro index e6e39572..53f7af8a 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro @@ -8,4 +8,5 @@ SOURCES += \ include(../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri) PLUGIN_TYPE = wayland-graphics-integration-server +PLUGIN_CLASS_NAME = QWaylandBrcmClientBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp index cd2c8646..b977f919 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -class QWaylandBrcmClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin +class QWaylandBrcmClientBufferIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json") @@ -50,7 +50,7 @@ public: QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QtWayland::ClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandBrcmClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro index 40092a14..04003112 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro @@ -8,4 +8,5 @@ SOURCES += \ include($PWD/../../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server +PLUGIN_CLASS_NAME = DrmEglServerBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro index e21bb3c5..9e28c7e8 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro @@ -8,4 +8,5 @@ SOURCES += \ include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server +PLUGIN_CLASS_NAME = LibHybrisEglServerBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 58b281fc..1f0ab32d 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -class QWaylandIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin +class QWaylandEglClientBufferIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json") @@ -51,7 +51,7 @@ public: QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QtWayland::ClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro index 9ddd961c..f2229175 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro @@ -8,4 +8,5 @@ SOURCES += \ include(../../../../hardwareintegration/compositor/wayland-egl/wayland-egl.pri) PLUGIN_TYPE = wayland-graphics-integration-server +PLUGIN_CLASS_NAME = QWaylandEglClientBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp index dfd55eb7..48ddf589 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin +class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json") @@ -50,7 +50,7 @@ public: QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro index fab000e2..7c391bd1 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro @@ -8,4 +8,5 @@ SOURCES += \ include(../../../../hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri) PLUGIN_TYPE = wayland-graphics-integration-server +PLUGIN_CLASS_NAME = QWaylandXCompositeEglClientBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp index 903a6c90..fbd0d8ce 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin +class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json") @@ -50,7 +50,7 @@ public: QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro index 9dee1431..0f49471d 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro @@ -8,4 +8,5 @@ SOURCES += \ include(../../../../hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri) PLUGIN_TYPE = wayland-graphics-integration-server +PLUGIN_CLASS_NAME = QWaylandXCompositeGlxClientBufferIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp index 7e2228cf..d1b3c733 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp +++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandBrcmEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-brcm-egl.json") @@ -52,7 +52,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandBrcmEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro index 4ff61713..6455aa31 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro +++ b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandBrcmEglPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp index 1143c859..d6999d4a 100644 --- a/src/plugins/platforms/qwayland-egl/main.cpp +++ b/src/plugins/platforms/qwayland-egl/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-egl.json") @@ -52,7 +52,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro index b64a8cc4..9ac050da 100644 --- a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro +++ b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandEglPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro index 5457e9df..bfeab3fe 100644 --- a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro +++ b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro @@ -6,4 +6,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp index 5393a03e..321182ad 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandXCompositeEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-egl.json") @@ -52,7 +52,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandXCompositeEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro index 7c7a3dd2..55246039 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro @@ -8,4 +8,5 @@ SOURCES += \ main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandXCompositeEglPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp index 4dcce14e..fdeda6e1 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandXCompositeGlxPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json") @@ -54,7 +54,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandXCompositeGlxPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro index c0c12c9d..899d939b 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro @@ -11,4 +11,5 @@ HEADERS += \ qwaylandxcompositeglxplatformintegration.h PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandXCompositeGlxPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro index baaf1698..6af584c5 100644 --- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro +++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro @@ -1,4 +1,5 @@ PLUGIN_TYPE = wayland-shell-integration +PLUGIN_CLASS_NAME = QWaylandIviShellIntegrationPlugin load(qt_plugin) QT += gui-private waylandclient-private |