Merge branch 'Plasma/5.6'

2016-03-15 11:01:31 +01:00 · 2016-03-15 11:01:31 +01:00 · 09176d06b6
commit 09176d06b6
parent 3d1b068da9 5295d9d330
2 changed files with 3 additions and 0 deletions
--- a/src/wayland/server/region_interface.h
+++ b/src/wayland/server/region_interface.h
@ -73,5 +73,6 @@ private:

 }
 }
+Q_DECLARE_METATYPE(KWayland::Server::RegionInterface*)

 #endif
--- a/src/wayland/surface_interface.h
+++ b/src/wayland/surface_interface.h
@ -217,4 +217,6 @@ private:
 }
 }

+Q_DECLARE_METATYPE(KWayland::Server::SurfaceInterface*)
+
 #endif