From e7a1e121d9cb92e89e53baba81aceedca24f2b94 Mon Sep 17 00:00:00 2001 From: Tomasz Olszak Date: Tue, 15 Apr 2014 10:16:36 +0200 Subject: build fix for MODULE_PLUGINS_TYPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8d44f50480440060eba84354e88fb2535e1d8e4a Reviewed-by: Jørgen Lind --- src/client/client.pro | 2 ++ .../hardwareintegration/qwaylandclientbufferintegrationfactory.cpp | 2 +- .../hardwareintegration/qwaylandserverbufferintegrationfactory.cpp | 2 +- src/compositor/compositor.pro | 1 + .../hardware_integration/qwlclientbufferintegrationfactory.cpp | 2 +- .../hardware_integration/qwlserverbufferintegrationfactory.cpp | 2 +- src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro | 2 +- .../hardwareintegration/client/drm-egl-server/drm-egl-server.pro | 2 +- src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro | 2 +- .../hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro | 2 +- .../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro | 2 +- src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro | 2 +- .../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro | 2 +- src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro | 2 +- .../hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro | 2 +- .../hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro | 2 +- 16 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/client/client.pro b/src/client/client.pro index 01d704a9..10cbd31a 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -3,6 +3,8 @@ QT += core-private gui-private QT_FOR_PRIVATE += platformsupport-private MODULE=waylandclient +MODULE_PLUGIN_TYPES = wayland-graphics-integration-client + load(qt_module) CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp index e168f612..7f2648bc 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/client"), Qt::CaseInsensitive)) + (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive)) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp index bd7661c2..2b61dbdc 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/client"), Qt::CaseInsensitive)) + (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive)) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 74c955dd..96a8318e 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -3,6 +3,7 @@ QT = core gui-private contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL +MODULE_PLUGIN_TYPES = wayland-graphics-integration-server load(qt_module) CONFIG += link_pkgconfig diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp index 1a4dbac4..489e2594 100644 --- a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp @@ -52,7 +52,7 @@ namespace QtWayland { #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QtWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/server"), Qt::CaseInsensitive)) + (QtWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-server"), Qt::CaseInsensitive)) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QtWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp index 6652d25a..be647a0e 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp @@ -52,7 +52,7 @@ namespace QtWayland { #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QtWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/server"), Qt::CaseInsensitive)) + (QtWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-server"), Qt::CaseInsensitive)) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QtWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro index d98b7941..39dcf570 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/client +PLUGIN_TYPE = wayland-graphics-integration-client load(qt_plugin) QT += waylandclient-private 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 d282afc8..3a579586 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 @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/client +PLUGIN_TYPE = wayland-graphics-integration-client load(qt_plugin) QT += waylandclient-private diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro index 0eca1d41..38989628 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/client +PLUGIN_TYPE = wayland-graphics-integration-client load(qt_plugin) QT += waylandclient-private diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro index 3129f844..97e642fb 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/client +PLUGIN_TYPE = wayland-graphics-integration-client load(qt_plugin) QT += waylandclient-private diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro index 3146b369..0080150c 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/client +PLUGIN_TYPE = wayland-graphics-integration-client load(qt_plugin) QT += waylandclient-private diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro index dd3886c4..1608004f 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/server +PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) QT = compositor compositor-private core-private gui-private 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 a4e53f61..4e269393 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 @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/server +PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) QT = compositor compositor-private core-private gui-private diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro index f0ad78ba..98977591 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/server +PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) QT = compositor compositor-private core-private gui-private diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro index 9c14eb84..059e462c 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/server +PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) QT += compositor compositor-private core-private gui-private diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro index 8ec0e564..d8d6f0e0 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro @@ -1,4 +1,4 @@ -PLUGIN_TYPE = wayland-graphics-integration/server +PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) QT += compositor compositor-private core-private gui-private -- cgit v1.2.1