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/hardwareintegration/client/libhybris-egl-server | |
| 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/hardwareintegration/client/libhybris-egl-server')
| -rw-r--r-- | src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 |