1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fix for MODULE_PLUGINS_TYPE

Browse Source 
Change-Id: I8d44f50480440060eba84354e88fb2535e1d8e4a
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
This commit is contained in:
Tomasz Olszak 2014-04-15 10:16:36 +02:00 committed by The Qt Project
parent 86146d9f86
commit 88d888b126
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/client.pro
View File

@ -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

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp
View File

@ -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

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp
View File

@ -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

2
src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/brcm-egl.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/wayland-egl.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/xcomposite-egl.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/xcomposite-glx.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private