diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-07 14:04:17 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-10 08:20:53 +0000 |
commit | 00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1 (patch) | |
tree | 1a135ec31593b76c38849621f1d4ecc5508266d8 /src/plugins | |
parent | 762d384b806deb84072a5c7eb6b91afa1e150c1f (diff) |
Rename QtCompositor to QtWaylandCompositor
enable building QtWaylandCompositor by default
Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/plugins')
13 files changed, 15 insertions, 18 deletions
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro index f47898a48..74da1643b 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT = compositor compositor-private core-private gui-private +QT = waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += brcm-egl.json diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp index 7996e4fe6..a7d08199c 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "brcmeglintegration.h" QT_BEGIN_NAMESPACE 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 4e2693937..806e1fac1 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,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT = compositor compositor-private core-private gui-private +QT = waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += drm-egl-server.json diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp index 33bd82eff..2f7dae457 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlserverbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> #include "drmeglserverbufferintegration.h" QT_BEGIN_NAMESPACE 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 fb59c40a2..7780df50d 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 @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT = compositor compositor-private core-private gui-private +QT = waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += libhybris-egl-server.json diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp index 004cd6c86..f166536b3 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp @@ -31,8 +31,8 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlserverbufferintegrationplugin_p.h> -#include <QtCompositor/private/qwlserverbufferintegration_p.h> +#include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h> #include "libhybriseglserverbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 4f0e1ab1d..d1cc75dd3 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -31,8 +31,8 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlclientbufferintegrationfactory_p.h> -#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlclientbufferintegrationfactory_p.h> +#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "waylandeglclientbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro index 98977591d..614c1cfef 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT = compositor compositor-private core-private gui-private +QT = waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += wayland-egl.json diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp index a8a366732..12d176390 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "xcompositeeglintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro index 059e462cc..5475f2046 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT += compositor compositor-private core-private gui-private +QT += waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += xcomposite-egl.json diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp index acf45e161..e6fd96bb2 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "xcompositeglxintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro index d8d6f0e0e..3441f271e 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT += compositor compositor-private core-private gui-private +QT += waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += xcomposite-glx.json diff --git a/src/plugins/hardwareintegration/hardwareintegration.pro b/src/plugins/hardwareintegration/hardwareintegration.pro index 4f5ec1458..59d867f9f 100644 --- a/src/plugins/hardwareintegration/hardwareintegration.pro +++ b/src/plugins/hardwareintegration/hardwareintegration.pro @@ -1,7 +1,4 @@ TEMPLATE=subdirs SUBDIRS += client -#The compositor plugins are only useful with QtCompositor -contains(CONFIG, wayland-compositor) { - SUBDIRS += compositor -} +SUBDIRS += compositor |