74 files changed, 50 insertions, 43 deletions

diff --git a/src/qt-compositor/qt-compositor.pri b/src/compositor/compositor.pri
index 7b421f314..de95dc4ce 100644
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/compositor/compositor.pri
@@ -1,5 +1,9 @@
+CONFIG += module
+MODULE_PRI += $$PWD/../../modules/qt_compositor.pri
+
 INCLUDEPATH += $$PWD
 DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
+DEFINES += QT_BUILD_COMPOSITOR_LIB
 
 !mac:use_pkgconfig {
     CONFIG += link_pkgconfig
@@ -19,6 +23,8 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
     LIBS += -lwayland-server -lffi
 }
 
+HEADERS += qtcompositorversion.h
+
 include ($$PWD/util/util.pri)
 include ($$PWD/wayland_wrapper/wayland_wrapper.pri)
 include ($$PWD/hardware_integration/hardware_integration.pri)
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
new file mode 100644
index 000000000..850e350dd
--- /dev/null
+++ b/src/compositor/compositor.pro
@@ -0,0 +1,10 @@
+load(qt_module)
+
+TARGET  = QtCompositor
+QPRO_PWD   = $$PWD
+
+include (compositor.pri)
+load(qt_module_config)
+
+QT += gui-private
+
diff --git a/src/qt-compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri
index 107266237..374c7747d 100644
--- a/src/qt-compositor/compositor_api/compositor_api.pri
+++ b/src/compositor/compositor_api/compositor_api.pri
@@ -8,14 +8,15 @@ SOURCES += \
     $$PWD/waylandcompositor.cpp \
     $$PWD/waylandsurface.cpp
 
-contains(QT, declarative) {
+QT += core-private
+
+contains(QT_CONFIG, quick) {
     SOURCES += $$PWD/waylandsurfaceitem.cpp
     HEADERS += $$PWD/waylandsurfaceitem.h
 
-   DEFINES += QT_COMPOSITOR_DECLARATIVE
-}
+    DEFINES += QT_COMPOSITOR_QUICK
 
-!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
-    QT += core-private
-    contains(QT, declarative):QT += declarative-private gui-private
+    QT += quick
+    QT += quick-private gui-private
 }
+
diff --git a/src/qt-compositor/compositor_api/waylandcompositor.cpp b/src/compositor/compositor_api/waylandcompositor.cpp
index a21a7eaf2..a21a7eaf2 100644
--- a/src/qt-compositor/compositor_api/waylandcompositor.cpp
+++ b/src/compositor/compositor_api/waylandcompositor.cpp
diff --git a/src/qt-compositor/compositor_api/waylandcompositor.h b/src/compositor/compositor_api/waylandcompositor.h
index 06d8ec703..557aa6ce9 100644
--- a/src/qt-compositor/compositor_api/waylandcompositor.h
+++ b/src/compositor/compositor_api/waylandcompositor.h
@@ -56,7 +56,7 @@ namespace Wayland
     class Compositor;
 }
 
-class WaylandCompositor
+class Q_COMPOSITOR_EXPORT WaylandCompositor
 {
 public:
     WaylandCompositor(QWindow *window = 0, const char *socketName = 0);
diff --git a/src/qt-compositor/compositor_api/waylandsurface.cpp b/src/compositor/compositor_api/waylandsurface.cpp
index 8fdc7370c..8fdc7370c 100644
--- a/src/qt-compositor/compositor_api/waylandsurface.cpp
+++ b/src/compositor/compositor_api/waylandsurface.cpp
diff --git a/src/qt-compositor/compositor_api/waylandsurface.h b/src/compositor/compositor_api/waylandsurface.h
index fb2e1721c..d9f68d7c1 100644
--- a/src/qt-compositor/compositor_api/waylandsurface.h
+++ b/src/compositor/compositor_api/waylandsurface.h
@@ -59,7 +59,7 @@ class Surface;
 class SurfacePrivate;
 }
 
-class WaylandSurface : public QObject
+class Q_COMPOSITOR_EXPORT WaylandSurface : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(WaylandSurface)
diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/compositor/compositor_api/waylandsurfaceitem.cpp
index bf91499d2..0de4f9884 100644
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
+++ b/src/compositor/compositor_api/waylandsurfaceitem.cpp
@@ -41,13 +41,13 @@
 #include "waylandsurfaceitem.h"
 #include "waylandsurface.h"
 
-#include <QtDeclarative/QSGEngine>
+#include <QtQuick/QSGEngine>
 
 #include <QtGui/QKeyEvent>
 
-#include <QtDeclarative/QSGSimpleTextureNode>
-#include <QtDeclarative/QSGSimpleRectNode>
-#include <QtDeclarative/QQuickCanvas>
+#include <QtQuick/QSGSimpleTextureNode>
+#include <QtQuick/QSGSimpleRectNode>
+#include <QtQuick/QQuickCanvas>
 
 class WaylandSurfaceTextureProvider : public QSGTextureProvider
 {
diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.h b/src/compositor/compositor_api/waylandsurfaceitem.h
index 78fcd0c66..a66a2cead 100644
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.h
+++ b/src/compositor/compositor_api/waylandsurfaceitem.h
@@ -46,14 +46,14 @@
 #include <QtQuick/QQuickItem>
 #include <QtQuick/qsgtexture.h>
 
-#include <private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
 
 class WaylandSurface;
 class WaylandSurfaceTextureProvider;
 
 Q_DECLARE_METATYPE(WaylandSurface*)
 
-class WaylandSurfaceItem : public QQuickItem
+class Q_COMPOSITOR_EXPORT WaylandSurfaceItem : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(WaylandSurface* surface READ surface WRITE setSurface)
diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/README b/src/compositor/hardware_integration/dri2_xcb/README
index e99500df7..e99500df7 100644
--- a/src/qt-compositor/hardware_integration/dri2_xcb/README
+++ b/src/compositor/hardware_integration/dri2_xcb/README
diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2_xcb.pri b/src/compositor/hardware_integration/dri2_xcb/dri2_xcb.pri
index 641c7a91a..641c7a91a 100644
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2_xcb.pri
+++ b/src/compositor/hardware_integration/dri2_xcb/dri2_xcb.pri
diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp b/src/compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp
index eb516d1d2..eb516d1d2 100644
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp
+++ b/src/compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp
diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h b/src/compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h
index 61d431ded..61d431ded 100644
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h
+++ b/src/compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h
diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp b/src/compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
index 0d16f78c6..0d16f78c6 100644
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
+++ b/src/compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h b/src/compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
index 9ed355815..9ed355815 100644
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
+++ b/src/compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
diff --git a/src/qt-compositor/hardware_integration/graphicshardwareintegration.cpp b/src/compositor/hardware_integration/graphicshardwareintegration.cpp
index c37598374..c37598374 100644
--- a/src/qt-compositor/hardware_integration/graphicshardwareintegration.cpp
+++ b/src/compositor/hardware_integration/graphicshardwareintegration.cpp
diff --git a/src/qt-compositor/hardware_integration/graphicshardwareintegration.h b/src/compositor/hardware_integration/graphicshardwareintegration.h
index 9f1f409d0..9f1f409d0 100644
--- a/src/qt-compositor/hardware_integration/graphicshardwareintegration.h
+++ b/src/compositor/hardware_integration/graphicshardwareintegration.h
diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri
index 02a834bbc..6e65ea9a3 100644
--- a/src/qt-compositor/hardware_integration/hardware_integration.pri
+++ b/src/compositor/hardware_integration/hardware_integration.pri
@@ -13,16 +13,16 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
         QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
     } else {
         contains(QT_CONFIG, opengles2) {
-            isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) {
-                QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
-                CONFIG += mesa_egl
-                DEFINES += MESA_EGL_NO_X11_HEADERS
+            isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
+                QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
+                CONFIG += xcomposite_egl
             } else:isEqual(QT_WAYLAND_GL_CONFIG,dri2_xcb) {
                 QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
                 CONFIG += dri2_xcb
             } else {
-                QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
-                CONFIG += xcomposite_egl
+                QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
+                CONFIG += wayland_egl
+                DEFINES += MESA_EGL_NO_X11_HEADERS
             }
         } else {
             QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
@@ -34,7 +34,7 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
     system(echo "Qt-Compositor configured as raster only compositor")
 }
 
-mesa_egl {
+wayland_egl {
     include (wayland_egl/wayland_egl.pri)
 }
 dri2_xcb {
diff --git a/src/qt-compositor/hardware_integration/wayland_egl/wayland_egl.pri b/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri
index 258923904..258923904 100644
--- a/src/qt-compositor/hardware_integration/wayland_egl/wayland_egl.pri
+++ b/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri
diff --git a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
index a232c4876..a232c4876 100644
--- a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
+++ b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
diff --git a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h
index 7add3df7d..7add3df7d 100644
--- a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h
+++ b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri b/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri
index f4be9a259..f4be9a259 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri
+++ b/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri
diff --git a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp b/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp
index dad0c0298..dad0c0298 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp
+++ b/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp
diff --git a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h b/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h
index 9e3b16f33..9e3b16f33 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h
+++ b/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri b/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri
index e8d4d0134..e8d4d0134 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri
+++ b/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri
diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp b/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
index 9d7043952..9d7043952 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
+++ b/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h b/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h
index 43f062fdf..43f062fdf 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h
+++ b/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml b/src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml
index 7d68d64a0..7d68d64a0 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml
+++ b/src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h
index f502bbaf3..f502bbaf3 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h
+++ b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c
index 1662ec823..1662ec823 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c
+++ b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h
index dfbb24dde..dfbb24dde 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h
+++ b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri b/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
index e4001a5bb..e4001a5bb 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
+++ b/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp
index b5b2d03d6..b5b2d03d6 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp
+++ b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositebuffer.h b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h
index 52154d406..52154d406 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositebuffer.h
+++ b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp b/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp
index a434c9aa4..a434c9aa4 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp
+++ b/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h b/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h
index 28f5cd3db..28f5cd3db 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h
+++ b/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h b/src/compositor/hardware_integration/xcomposite_share/xlibinclude.h
index dfb0c2965..dfb0c2965 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h
+++ b/src/compositor/hardware_integration/xcomposite_share/xlibinclude.h
diff --git a/src/qt-compositor/util/util.pri b/src/compositor/util/util.pri
index fe5e9e606..fe5e9e606 100644
--- a/src/qt-compositor/util/util.pri
+++ b/src/compositor/util/util.pri
diff --git a/src/qt-compositor/util/waylandobject.h b/src/compositor/util/waylandobject.h
index a64cfd0c7..a64cfd0c7 100644
--- a/src/qt-compositor/util/waylandobject.h
+++ b/src/compositor/util/waylandobject.h
diff --git a/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri
index 478b39982..478b39982 100644
--- a/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri
+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri
diff --git a/src/qt-compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp
index 168094734..168094734 100644
--- a/src/qt-compositor/wayland_wrapper/wlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/wlcompositor.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wlcompositor.h b/src/compositor/wayland_wrapper/wlcompositor.h
index 9aaba776d..9aaba776d 100644
--- a/src/qt-compositor/wayland_wrapper/wlcompositor.h
+++ b/src/compositor/wayland_wrapper/wlcompositor.h
diff --git a/src/qt-compositor/wayland_wrapper/wldatadevice.cpp b/src/compositor/wayland_wrapper/wldatadevice.cpp
index e7bdfb434..e7bdfb434 100644
--- a/src/qt-compositor/wayland_wrapper/wldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/wldatadevice.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wldatadevice.h b/src/compositor/wayland_wrapper/wldatadevice.h
index 4be777dbf..4be777dbf 100644
--- a/src/qt-compositor/wayland_wrapper/wldatadevice.h
+++ b/src/compositor/wayland_wrapper/wldatadevice.h
diff --git a/src/qt-compositor/wayland_wrapper/wldatadevicemanager.cpp b/src/compositor/wayland_wrapper/wldatadevicemanager.cpp
index 834ef9545..834ef9545 100644
--- a/src/qt-compositor/wayland_wrapper/wldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/wldatadevicemanager.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wldatadevicemanager.h b/src/compositor/wayland_wrapper/wldatadevicemanager.h
index 87398c4cf..87398c4cf 100644
--- a/src/qt-compositor/wayland_wrapper/wldatadevicemanager.h
+++ b/src/compositor/wayland_wrapper/wldatadevicemanager.h
diff --git a/src/qt-compositor/wayland_wrapper/wldataoffer.cpp b/src/compositor/wayland_wrapper/wldataoffer.cpp
index 882337352..882337352 100644
--- a/src/qt-compositor/wayland_wrapper/wldataoffer.cpp
+++ b/src/compositor/wayland_wrapper/wldataoffer.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wldataoffer.h b/src/compositor/wayland_wrapper/wldataoffer.h
index 5db80f62b..5db80f62b 100644
--- a/src/qt-compositor/wayland_wrapper/wldataoffer.h
+++ b/src/compositor/wayland_wrapper/wldataoffer.h
diff --git a/src/qt-compositor/wayland_wrapper/wldatasource.cpp b/src/compositor/wayland_wrapper/wldatasource.cpp
index a3c75ec73..a3c75ec73 100644
--- a/src/qt-compositor/wayland_wrapper/wldatasource.cpp
+++ b/src/compositor/wayland_wrapper/wldatasource.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wldatasource.h b/src/compositor/wayland_wrapper/wldatasource.h
index 59385ecc3..59385ecc3 100644
--- a/src/qt-compositor/wayland_wrapper/wldatasource.h
+++ b/src/compositor/wayland_wrapper/wldatasource.h
diff --git a/src/qt-compositor/wayland_wrapper/wldisplay.cpp b/src/compositor/wayland_wrapper/wldisplay.cpp
index 4277de166..4277de166 100644
--- a/src/qt-compositor/wayland_wrapper/wldisplay.cpp
+++ b/src/compositor/wayland_wrapper/wldisplay.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wldisplay.h b/src/compositor/wayland_wrapper/wldisplay.h
index 5b2e5023d..5b2e5023d 100644
--- a/src/qt-compositor/wayland_wrapper/wldisplay.h
+++ b/src/compositor/wayland_wrapper/wldisplay.h
diff --git a/src/qt-compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/wlinputdevice.cpp
index a7ce0d43a..a7ce0d43a 100644
--- a/src/qt-compositor/wayland_wrapper/wlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/wlinputdevice.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wlinputdevice.h b/src/compositor/wayland_wrapper/wlinputdevice.h
index 7ea56a918..7ea56a918 100644
--- a/src/qt-compositor/wayland_wrapper/wlinputdevice.h
+++ b/src/compositor/wayland_wrapper/wlinputdevice.h
diff --git a/src/qt-compositor/wayland_wrapper/wloutput.cpp b/src/compositor/wayland_wrapper/wloutput.cpp
index 0f61bc051..0f61bc051 100644
--- a/src/qt-compositor/wayland_wrapper/wloutput.cpp
+++ b/src/compositor/wayland_wrapper/wloutput.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wloutput.h b/src/compositor/wayland_wrapper/wloutput.h
index 84c91a2f5..84c91a2f5 100644
--- a/src/qt-compositor/wayland_wrapper/wloutput.h
+++ b/src/compositor/wayland_wrapper/wloutput.h
diff --git a/src/qt-compositor/wayland_wrapper/wlshell.cpp b/src/compositor/wayland_wrapper/wlshell.cpp
index e6ab73762..e6ab73762 100644
--- a/src/qt-compositor/wayland_wrapper/wlshell.cpp
+++ b/src/compositor/wayland_wrapper/wlshell.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wlshell.h b/src/compositor/wayland_wrapper/wlshell.h
index a748186e8..a748186e8 100644
--- a/src/qt-compositor/wayland_wrapper/wlshell.h
+++ b/src/compositor/wayland_wrapper/wlshell.h
diff --git a/src/qt-compositor/wayland_wrapper/wlshmbuffer.cpp b/src/compositor/wayland_wrapper/wlshmbuffer.cpp
index c5126aeaa..c5126aeaa 100644
--- a/src/qt-compositor/wayland_wrapper/wlshmbuffer.cpp
+++ b/src/compositor/wayland_wrapper/wlshmbuffer.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wlshmbuffer.h b/src/compositor/wayland_wrapper/wlshmbuffer.h
index e8092ce2a..e8092ce2a 100644
--- a/src/qt-compositor/wayland_wrapper/wlshmbuffer.h
+++ b/src/compositor/wayland_wrapper/wlshmbuffer.h
diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/wlsurface.cpp
index 1edbeb7ea..1edbeb7ea 100644
--- a/src/qt-compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/compositor/wayland_wrapper/wlsurface.cpp
diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.h b/src/compositor/wayland_wrapper/wlsurface.h
index 4d037a26e..4d037a26e 100644
--- a/src/qt-compositor/wayland_wrapper/wlsurface.h
+++ b/src/compositor/wayland_wrapper/wlsurface.h
diff --git a/src/qt-compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c b/src/compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c
index 7e8861b67..7e8861b67 100644
--- a/src/qt-compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c
+++ b/src/compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c
diff --git a/src/qt-compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h b/src/compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h
index 5b7dda247..5b7dda247 100644
--- a/src/qt-compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h
+++ b/src/compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h
diff --git a/src/qt-compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
index 815032fbc..815032fbc 100644
--- a/src/qt-compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
+++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
diff --git a/src/qt-compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
index 950fed1dd..950fed1dd 100644
--- a/src/qt-compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
+++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
diff --git a/src/qt-compositor/windowmanagerprotocol/windowmanager.xml b/src/compositor/windowmanagerprotocol/windowmanager.xml
index 6f0db5b6f..6f0db5b6f 100644
--- a/src/qt-compositor/windowmanagerprotocol/windowmanager.xml
+++ b/src/compositor/windowmanagerprotocol/windowmanager.xml
diff --git a/src/qt-compositor/windowmanagerprotocol/windowmanagerprotocol.pri b/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
index b03b08778..b03b08778 100644
--- a/src/qt-compositor/windowmanagerprotocol/windowmanagerprotocol.pri
+++ b/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
new file mode 100644
index 000000000..b912e2554
--- /dev/null
+++ b/src/plugins/platforms/platforms.pro
@@ -0,0 +1,2 @@
+TEMPLATE=subdirs
+SUBDIRS += wayland
diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
index 20c3aa0bd..8b41f2121 100644
--- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
+++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
@@ -10,15 +10,15 @@ SOURCES += \
 
     QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
     contains(QT_CONFIG, opengles2) {
-        isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) {
-            QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
-            CONFIG += wayland_egl
+        isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
+            QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
+            CONFIG += xcomposite_egl
         } else:isEqual(QT_WAYLAND_GL_CONFIG,readback) {
             QT_WAYLAND_GL_INTEGRATION = readback_egl
             CONFIG += readback_egl
         } else {
-            QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
-            CONFIG += xcomposite_egl
+            QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
+            CONFIG += wayland_egl
         }
     } else:mac {
         QT_WAYLAND_GL_INTEGRATION = readback_cgl
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 3df4cb737..6493ec01b 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -1,9 +1,10 @@
 TARGET = qwayland
 load(qt_plugin)
+load(qt_module)
 
 CONFIG += qpa/genericunixfontdatabase
 
-#DESTDIR = $$QT.gui.plugins/platforms
+DESTDIR = $$QT.gui.plugins/platforms
 
 DEFINES += Q_PLATFORM_WAYLAND
 DEFINES += $$QMAKE_DEFINES_WAYLAND
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
new file mode 100644
index 000000000..3dd6c024b
--- /dev/null
+++ b/src/plugins/plugins.pro
@@ -0,0 +1,2 @@
+TEMPLATE=subdirs
+SUBDIRS += platforms
diff --git a/src/qt-compositor/qt-compositor.pro b/src/qt-compositor/qt-compositor.pro
deleted file mode 100644
index 0d122770e..000000000
--- a/src/qt-compositor/qt-compositor.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = lib
-
-include (qt-compositor.pri)
-
-installPath = $$INSTALLBASE
-
-target.path = $$installPath/lib
-headers_path = $$installPath/include
-
-headers.path = $$headers_path/qt-compositor
-headers.files = $$HEADERS
-
-INSTALLS = target headers
-
-QT += gui-private
diff --git a/src/src.pro b/src/src.pro
index d2dd7c8f2..81bc9ac93 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,2 @@
 TEMPLATE=subdirs
-SUBDIRS=qt-compositor
+SUBDIRS += plugins compositor