diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-15 16:08:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-15 19:22:39 +0200 |
| commit | 17b37f7e907d10d028b70f43b8afc80a384519a4 (patch) | |
| tree | ef2a85fb3f970db164c1c73a973cea0d9dbdc157 /src/plugins | |
| parent | 1c5581d4d666b61878f1f89655bd69fbb3813eb8 (diff) | |
| parent | e7a1e121d9cb92e89e53baba81aceedca24f2b94 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
also amended the libhybris plugin according to the merged change.
Change-Id: I2987043cf21936aa0f221343d00dacdc574be06a
Diffstat (limited to 'src/plugins')
12 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro index d98b7941b..39dcf570d 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 d282afc81..3a5795868 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/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro index 4d7909701..6af6d5c10 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 @@ -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 0eca1d411..389896288 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 3129f844b..97e642fbb 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 3146b3696..0080150cc 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 dd3886c47..1608004fe 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 a4e53f61a..4e2693937 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/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro index 7a209724f..fb59c40a2 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,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 f0ad78ba1..98977591d 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 9c14eb840..059e462cc 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 8ec0e5642..d8d6f0e0e 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 |