summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-07 14:04:17 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-10 08:20:53 +0000
commit00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1 (patch)
tree1a135ec31593b76c38849621f1d4ecc5508266d8
parent762d384b806deb84072a5c7eb6b91afa1e150c1f (diff)
Rename QtCompositor to QtWaylandCompositor
enable building QtWaylandCompositor by default Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
-rw-r--r--examples/wayland/multi-output/multi-output.pro2
-rw-r--r--examples/wayland/pure-qml/pure-qml.pro2
-rw-r--r--examples/wayland/qml-compositor/main.cpp6
-rw-r--r--examples/wayland/qml-compositor/qml-compositor.pro4
-rw-r--r--examples/wayland/qwindow-compositor/qwindow-compositor.pro4
-rw-r--r--examples/wayland/qwindow-compositor/qwindowcompositor.cpp16
-rw-r--r--examples/wayland/qwindow-compositor/qwindowcompositor.h6
-rw-r--r--examples/wayland/server-buffer/compositor/compositor.pro2
-rw-r--r--examples/wayland/server-buffer/compositor/main.cpp10
-rw-r--r--examples/wayland/server-buffer/compositor/serverbufferitem.cpp2
-rw-r--r--examples/wayland/wayland.pro16
-rw-r--r--src/compositor/compositor.pro3
-rw-r--r--src/compositor/compositor_api/qwaylandbufferref.h4
-rw-r--r--src/compositor/compositor_api/qwaylandclient.cpp4
-rw-r--r--src/compositor/compositor_api/qwaylandclient.h2
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.cpp22
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.h6
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor_p.h8
-rw-r--r--src/compositor/compositor_api/qwaylanddestroylistener.h2
-rw-r--r--src/compositor/compositor_api/qwaylanddrag.cpp2
-rw-r--r--src/compositor/compositor_api/qwaylanddrag.h2
-rw-r--r--src/compositor/compositor_api/qwaylandinput.cpp12
-rw-r--r--src/compositor/compositor_api/qwaylandinput.h6
-rw-r--r--src/compositor/compositor_api/qwaylandinput_p.h6
-rw-r--r--src/compositor/compositor_api/qwaylandinputpanel.cpp2
-rw-r--r--src/compositor/compositor_api/qwaylandinputpanel.h4
-rw-r--r--src/compositor/compositor_api/qwaylandkeyboard.cpp8
-rw-r--r--src/compositor/compositor_api/qwaylandkeyboard.h4
-rw-r--r--src/compositor/compositor_api/qwaylandkeyboard_p.h10
-rw-r--r--src/compositor/compositor_api/qwaylandoutput.cpp8
-rw-r--r--src/compositor/compositor_api/qwaylandoutput.h2
-rw-r--r--src/compositor/compositor_api/qwaylandoutput_p.h12
-rw-r--r--src/compositor/compositor_api/qwaylandoutputspace.cpp4
-rw-r--r--src/compositor/compositor_api/qwaylandoutputspace.h2
-rw-r--r--src/compositor/compositor_api/qwaylandoutputspace_p.h8
-rw-r--r--src/compositor/compositor_api/qwaylandpointer.cpp4
-rw-r--r--src/compositor/compositor_api/qwaylandpointer.h2
-rw-r--r--src/compositor/compositor_api/qwaylandpointer_p.h14
-rw-r--r--src/compositor/compositor_api/qwaylandquickcompositor.cpp2
-rw-r--r--src/compositor/compositor_api/qwaylandquickcompositor.h2
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp8
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.h6
-rw-r--r--src/compositor/compositor_api/qwaylandquickoutput.h2
-rw-r--r--src/compositor/compositor_api/qwaylandquicksurface.cpp10
-rw-r--r--src/compositor/compositor_api/qwaylandquicksurface.h2
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp16
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.h6
-rw-r--r--src/compositor/compositor_api/qwaylandsurface_p.h12
-rw-r--r--src/compositor/compositor_api/qwaylandtouch.cpp10
-rw-r--r--src/compositor/compositor_api/qwaylandtouch.h2
-rw-r--r--src/compositor/compositor_api/qwaylandtouch_p.h14
-rw-r--r--src/compositor/compositor_api/qwaylandview.cpp6
-rw-r--r--src/compositor/compositor_api/qwaylandview.h4
-rw-r--r--src/compositor/compositor_api/qwaylandview_p.h2
-rw-r--r--src/compositor/extensions/qwaylandshell.cpp10
-rw-r--r--src/compositor/extensions/qwaylandshell.h2
-rw-r--r--src/compositor/extensions/qwaylandshell_p.h14
-rw-r--r--src/compositor/extensions/qwaylandwindowmanagerextension.cpp4
-rw-r--r--src/compositor/extensions/qwaylandwindowmanagerextension.h4
-rw-r--r--src/compositor/extensions/qwaylandwindowmanagerextension_p.h4
-rw-r--r--src/compositor/extensions/qwlextendedsurface.cpp2
-rw-r--r--src/compositor/extensions/qwlextendedsurface_p.h6
-rw-r--r--src/compositor/extensions/qwlinputmethod.cpp6
-rw-r--r--src/compositor/extensions/qwlinputmethod_p.h8
-rw-r--r--src/compositor/extensions/qwlinputmethodcontext_p.h2
-rw-r--r--src/compositor/extensions/qwlinputpanel.cpp4
-rw-r--r--src/compositor/extensions/qwlinputpanel_p.h8
-rw-r--r--src/compositor/extensions/qwlinputpanelsurface.cpp4
-rw-r--r--src/compositor/extensions/qwlinputpanelsurface_p.h2
-rw-r--r--src/compositor/extensions/qwlqtkey.cpp2
-rw-r--r--src/compositor/extensions/qwlqtkey_p.h6
-rw-r--r--src/compositor/extensions/qwlqttouch_p.h6
-rw-r--r--src/compositor/extensions/qwltextinput.cpp6
-rw-r--r--src/compositor/extensions/qwltextinput_p.h4
-rw-r--r--src/compositor/extensions/qwltextinputmanager.cpp2
-rw-r--r--src/compositor/extensions/qwltextinputmanager_p.h4
-rw-r--r--src/compositor/global/qwaylandextension.h2
-rw-r--r--src/compositor/global/qwaylandquickextension.h2
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegration_p.h4
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h2
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h4
-rw-r--r--src/compositor/hardware_integration/qwlhwintegration.cpp2
-rw-r--r--src/compositor/hardware_integration/qwlhwintegration_p.h4
-rw-r--r--src/compositor/hardware_integration/qwlserverbufferintegration_p.h2
-rw-r--r--src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h2
-rw-r--r--src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h2
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevice.cpp8
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevice_p.h8
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevicemanager.cpp6
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevicemanager_p.h4
-rw-r--r--src/compositor/wayland_wrapper/qwldataoffer_p.h2
-rw-r--r--src/compositor/wayland_wrapper/qwldatasource.cpp2
-rw-r--r--src/compositor/wayland_wrapper/qwldatasource_p.h2
-rw-r--r--src/compositor/wayland_wrapper/qwlregion_p.h4
-rw-r--r--src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp2
-rw-r--r--src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h2
-rw-r--r--src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h2
-rw-r--r--src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp4
-rw-r--r--src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h2
-rw-r--r--src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h6
-rw-r--r--src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h6
-rw-r--r--src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp2
-rw-r--r--src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h2
-rw-r--r--src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp2
-rw-r--r--src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h4
-rw-r--r--src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h2
-rw-r--r--src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h4
-rw-r--r--src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h2
-rw-r--r--src/imports/compositor/compositor.pro2
-rw-r--r--src/imports/compositor/qwaylandmousetracker_p.h2
-rw-r--r--src/imports/compositor/qwaylandquickcompositorplugin.cpp26
-rw-r--r--src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp2
-rw-r--r--src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp2
-rw-r--r--src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp4
-rw-r--r--src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp4
-rw-r--r--src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp2
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp2
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro2
-rw-r--r--src/plugins/hardwareintegration/hardwareintegration.pro5
-rw-r--r--src/qtwaylandscanner/qtwaylandscanner.cpp5
-rw-r--r--src/src.pro22
-rw-r--r--sync.profile2
-rw-r--r--tests/auto/compositor/compositor.pro2
128 files changed, 315 insertions, 330 deletions
diff --git a/examples/wayland/multi-output/multi-output.pro b/examples/wayland/multi-output/multi-output.pro
index ed9545d4..7416cdb2 100644
--- a/examples/wayland/multi-output/multi-output.pro
+++ b/examples/wayland/multi-output/multi-output.pro
@@ -1,4 +1,4 @@
-QT += core-private gui-private quick-private compositor-private
+QT += core-private gui-private quick-private
SOURCES += \
main.cpp
diff --git a/examples/wayland/pure-qml/pure-qml.pro b/examples/wayland/pure-qml/pure-qml.pro
index 55b5568b..02bf68b9 100644
--- a/examples/wayland/pure-qml/pure-qml.pro
+++ b/examples/wayland/pure-qml/pure-qml.pro
@@ -1,4 +1,4 @@
-QT += core-private gui-private quick-private compositor-private
+QT += core-private gui-private quick-private
SOURCES += \
main.cpp
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp
index a01183bb..b58c4603 100644
--- a/examples/wayland/qml-compositor/main.cpp
+++ b/examples/wayland/qml-compositor/main.cpp
@@ -42,9 +42,9 @@
#include "qwaylandquickcompositor.h"
#include "qwaylandquicksurface.h"
-#include <QtCompositor/qwaylandquickitem.h>
-#include <QtCompositor/QWaylandQuickOutput>
-#include <QtCompositor/qwaylandoutputspace.h>
+#include <QtWaylandCompositor/qwaylandquickitem.h>
+#include <QtWaylandCompositor/QWaylandQuickOutput>
+#include <QtWaylandCompositor/qwaylandoutputspace.h>
#include <QGuiApplication>
#include <QTimer>
diff --git a/examples/wayland/qml-compositor/qml-compositor.pro b/examples/wayland/qml-compositor/qml-compositor.pro
index f908a2f2..e66630e7 100644
--- a/examples/wayland/qml-compositor/qml-compositor.pro
+++ b/examples/wayland/qml-compositor/qml-compositor.pro
@@ -5,10 +5,10 @@ LIBS += -L ../../lib
QT += quick qml
QT += quick-private
-QT += compositor
+QT += waylandcompositor
# if you want to compile QtCompositor as part of the application
-# instead of linking to it, remove the QT += compositor and uncomment
+# instead of linking to it, remove the QT += waylandcompositor and uncomment
# the following line
#include (../../src/compositor/compositor.pri)
diff --git a/examples/wayland/qwindow-compositor/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro
index c630b8c3..a924cfd6 100644
--- a/examples/wayland/qwindow-compositor/qwindow-compositor.pro
+++ b/examples/wayland/qwindow-compositor/qwindow-compositor.pro
@@ -1,4 +1,4 @@
-QT += gui gui-private core-private compositor compositor-private
+QT += gui gui-private core-private waylandcompositor waylandcompositor-private
LIBS += -L ../../lib
#include (../../src/qt-compositor/qt-compositor.pri)
@@ -17,7 +17,7 @@ SOURCES += main.cpp \
INCLUDEPATH += $$PWD/../../include
# if you want to compile QtCompositor as part of the application
-# instead of linking to it, remove the QT += compositor and uncomment
+# instead of linking to it, remove the QT += waylandcompositor and uncomment
# the following line
#include(../../src/compositor/compositor.pri)
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index 9f9a8e06..c8502ec8 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
@@ -53,14 +53,14 @@
#include <QScreen>
#include <QPainter>
-#include <QtCompositor/qwaylandinput.h>
-#include <QtCompositor/qwaylandbufferref.h>
-#include <QtCompositor/qwaylandview.h>
-#include <QtCompositor/qwaylandoutput.h>
-#include <QtCompositor/qwaylandoutputspace.h>
-
-#include <QtCompositor/QWaylandShellSurface>
-#include <QtCompositor/private/qwlextendedsurface_p.h>
+#include <QtWaylandCompositor/qwaylandinput.h>
+#include <QtWaylandCompositor/qwaylandbufferref.h>
+#include <QtWaylandCompositor/qwaylandview.h>
+#include <QtWaylandCompositor/qwaylandoutput.h>
+#include <QtWaylandCompositor/qwaylandoutputspace.h>
+
+#include <QtWaylandCompositor/QWaylandShellSurface>
+#include <QtWaylandCompositor/private/qwlextendedsurface_p.h>
QT_BEGIN_NAMESPACE
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.h b/examples/wayland/qwindow-compositor/qwindowcompositor.h
index 9e1eb080..30ee3323 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.h
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.h
@@ -41,9 +41,9 @@
#ifndef QWINDOWCOMPOSITOR_H
#define QWINDOWCOMPOSITOR_H
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandSurface>
-#include <QtCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandView>
#include "textureblitter.h"
#include "compositorwindow.h"
diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro
index 9f7751a0..a01b6fae 100644
--- a/examples/wayland/server-buffer/compositor/compositor.pro
+++ b/examples/wayland/server-buffer/compositor/compositor.pro
@@ -1,4 +1,4 @@
-QT += core-private gui-private quick-private compositor-private
+QT += core-private gui-private quick-private waylandcompositor-private
LIBS += -lwayland-server
diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index ecec5c8c..29f83959 100644
--- a/examples/wayland/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
@@ -56,11 +56,11 @@
#include <QQuickView>
#include "qwayland-server-share-buffer.h"
-#include <QtCompositor/QWaylandQuickOutput>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandQuickItem>
-#include <QtCompositor/private/qwaylandcompositor_p.h>
-#include <QtCompositor/private/qwlserverbufferintegration_p.h>
+#include <QtWaylandCompositor/QWaylandQuickOutput>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandQuickItem>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h>
#include "serverbufferitem.h"
diff --git a/examples/wayland/server-buffer/compositor/serverbufferitem.cpp b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp
index 96ceed0a..4cf5f71f 100644
--- a/examples/wayland/server-buffer/compositor/serverbufferitem.cpp
+++ b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp
@@ -45,7 +45,7 @@
#include <QtQuick/QSGSimpleTextureNode>
#include <QtQuick/QQuickWindow>
-#include <QtCompositor/private/qwlserverbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h>
QT_BEGIN_NAMESPACE
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
index 6b9272fc..29c9fff6 100644
--- a/examples/wayland/wayland.pro
+++ b/examples/wayland/wayland.pro
@@ -1,14 +1,10 @@
TEMPLATE=subdirs
-#Only build compositor examples if we are building
-#the QtCompositor API
-contains(CONFIG, wayland-compositor) {
- SUBDIRS += qwindow-compositor
+SUBDIRS += qwindow-compositor
- qtHaveModule(quick) {
- SUBDIRS += qml-compositor
- }
-
- SUBDIRS += server-buffer
- SUBDIRS += pure-qml
+qtHaveModule(quick) {
+ SUBDIRS += qml-compositor
}
+
+SUBDIRS += server-buffer
+SUBDIRS += pure-qml
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
index 90efd1fe..127ed257 100644
--- a/src/compositor/compositor.pro
+++ b/src/compositor/compositor.pro
@@ -1,8 +1,9 @@
-TARGET = QtCompositor
+TARGET = QtWaylandCompositor
QT = core gui-private
contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL
+MODULE=waylandcompositor
MODULE_PLUGIN_TYPES = wayland-graphics-integration-server
load(qt_module)
diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h
index 37166ebe..24d4e4a9 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.h
+++ b/src/compositor/compositor_api/qwaylandbufferref.h
@@ -43,8 +43,8 @@
#include <QtGui/qopengl.h>
#endif
-#include <QtCompositor/QWaylandSurface>
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/qwaylandexport.h>
struct wl_resource;
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index df5cf7d2..8eb1eb1b 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -37,8 +37,8 @@
#include "qwaylandclient.h"
#include <QtCore/private/qobject_p.h>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
#include <wayland-server.h>
diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h
index dde36f79..42051cb6 100644
--- a/src/compositor/compositor_api/qwaylandclient.h
+++ b/src/compositor/compositor_api/qwaylandclient.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDCLIENT_H
#define QWAYLANDCLIENT_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QObject>
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 6ccc8ee0..03ba1e68 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -38,17 +38,17 @@
#include "qwaylandcompositor.h"
#include "qwaylandcompositor_p.h"
-#include <QtCompositor/qwaylandclient.h>
-#include <QtCompositor/qwaylandinput.h>
-#include <QtCompositor/qwaylandoutput.h>
-#include <QtCompositor/qwaylandview.h>
-#include <QtCompositor/qwaylandclient.h>
-#include <QtCompositor/qwaylandkeyboard.h>
-#include <QtCompositor/qwaylandpointer.h>
-#include <QtCompositor/qwaylandtouch.h>
-
-#include <QtCompositor/private/qwaylandkeyboard_p.h>
-#include <QtCompositor/private/qwaylandsurface_p.h>
+#include <QtWaylandCompositor/qwaylandclient.h>
+#include <QtWaylandCompositor/qwaylandinput.h>
+#include <QtWaylandCompositor/qwaylandoutput.h>
+#include <QtWaylandCompositor/qwaylandview.h>
+#include <QtWaylandCompositor/qwaylandclient.h>
+#include <QtWaylandCompositor/qwaylandkeyboard.h>
+#include <QtWaylandCompositor/qwaylandpointer.h>
+#include <QtWaylandCompositor/qwaylandtouch.h>
+
+#include <QtWaylandCompositor/private/qwaylandkeyboard_p.h>
+#include <QtWaylandCompositor/private/qwaylandsurface_p.h>
#include "wayland_wrapper/qwldatadevice_p.h"
#include "wayland_wrapper/qwldatadevicemanager_p.h"
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index f986c644..177172d8 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -37,9 +37,9 @@
#ifndef QWAYLANDCOMPOSITOR_H
#define QWAYLANDCOMPOSITOR_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandextension.h>
-#include <QtCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/QWaylandOutput>
#include <QObject>
#include <QImage>
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 1975bd87..f73fb4e1 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -38,14 +38,14 @@
#ifndef QWAYLANDCOMPOSITOR_P_H
#define QWAYLANDCOMPOSITOR_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandOutputSpace>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandOutputSpace>
#include <QtCore/private/qobject_p.h>
#include <QtCore/QSet>
#include <QtCore/QElapsedTimer>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.h b/src/compositor/compositor_api/qwaylanddestroylistener.h
index 6e141b82..3a5684aa 100644
--- a/src/compositor/compositor_api/qwaylanddestroylistener.h
+++ b/src/compositor/compositor_api/qwaylanddestroylistener.h
@@ -39,7 +39,7 @@
#define QWAYLANDDESTROYLISTENER_H
#include <QtCore/QObject>
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp
index 22357ec4..935feda5 100644
--- a/src/compositor/compositor_api/qwaylanddrag.cpp
+++ b/src/compositor/compositor_api/qwaylanddrag.cpp
@@ -40,7 +40,7 @@
#include "qwldatadevice_p.h"
#include "qwaylandview.h"
-#include <QtCompositor/private/qwaylandinput_p.h>
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylanddrag.h b/src/compositor/compositor_api/qwaylanddrag.h
index f45d8587..4903c354 100644
--- a/src/compositor/compositor_api/qwaylanddrag.h
+++ b/src/compositor/compositor_api/qwaylanddrag.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDDRAG_H
#define QWAYLANDDRAG_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtCore/QObject>
#include <QtCore/QPointF>
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp
index 7a0fb6ee..b7beb23f 100644
--- a/src/compositor/compositor_api/qwaylandinput.cpp
+++ b/src/compositor/compositor_api/qwaylandinput.cpp
@@ -39,12 +39,12 @@
#include "qwaylandcompositor.h"
#include "qwaylandview.h"
-#include <QtCompositor/QWaylandDrag>
-#include <QtCompositor/QWaylandTouch>
-#include <QtCompositor/private/qwlinputmethod_p.h>
-#include <QtCompositor/private/qwaylandinput_p.h>
-#include <QtCompositor/private/qwaylandcompositor_p.h>
-#include <QtCompositor/private/qwldatadevice_p.h>
+#include <QtWaylandCompositor/QWaylandDrag>
+#include <QtWaylandCompositor/QWaylandTouch>
+#include <QtWaylandCompositor/private/qwlinputmethod_p.h>
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwldatadevice_p.h>
#include "extensions/qwlqtkey_p.h"
diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h
index b28fcd0c..17835683 100644
--- a/src/compositor/compositor_api/qwaylandinput.h
+++ b/src/compositor/compositor_api/qwaylandinput.h
@@ -41,9 +41,9 @@
#include <QtCore/QPoint>
#include <QtCore/QString>
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandextension.h>
-#include <QtCompositor/qwaylandkeyboard.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandkeyboard.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandinput_p.h b/src/compositor/compositor_api/qwaylandinput_p.h
index 162a52ee..80e8c76a 100644
--- a/src/compositor/compositor_api/qwaylandinput_p.h
+++ b/src/compositor/compositor_api/qwaylandinput_p.h
@@ -39,8 +39,8 @@
#include <stdint.h>
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandinput.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandinput.h>
#include <QtCore/QList>
#include <QtCore/QPoint>
@@ -51,7 +51,7 @@
#include <xkbcommon/xkbcommon.h>
#endif
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandinputpanel.cpp b/src/compositor/compositor_api/qwaylandinputpanel.cpp
index 73b2ddb7..6f774cd9 100644
--- a/src/compositor/compositor_api/qwaylandinputpanel.cpp
+++ b/src/compositor/compositor_api/qwaylandinputpanel.cpp
@@ -36,7 +36,7 @@
#include "qwaylandinputpanel.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include <private/qobject_p.h>
diff --git a/src/compositor/compositor_api/qwaylandinputpanel.h b/src/compositor/compositor_api/qwaylandinputpanel.h
index 70e2246d..cce1f458 100644
--- a/src/compositor/compositor_api/qwaylandinputpanel.h
+++ b/src/compositor/compositor_api/qwaylandinputpanel.h
@@ -37,8 +37,8 @@
#ifndef QWAYLANDINPUTPANEL_H
#define QWAYLANDINPUTPANEL_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandextension.h>
#include <QObject>
#include <QRect>
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index 4de67691..7f725f54 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -37,11 +37,11 @@
#include "qwaylandkeyboard.h"
#include "qwaylandkeyboard_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandInputDevice>
-#include <QtCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandClient>
-#include <QtCompositor/QWaylandShellSurface>
+#include <QtWaylandCompositor/QWaylandShellSurface>
#include <QtCore/QFile>
#include <QtCore/QStandardPaths>
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h
index c95634ed..17a239f7 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard.h
@@ -40,8 +40,8 @@
#include <QtCore/QObject>
-#include <QtCompositor/QWaylandExtensionContainer>
-#include <QtCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandExtensionContainer>
+#include <QtWaylandCompositor/QWaylandSurface>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
index 498a967b..69e3f6a6 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
@@ -38,13 +38,13 @@
#ifndef QTWAYLAND_QWLKEYBOARD_P_H
#define QTWAYLAND_QWLKEYBOARD_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandinput.h>
-#include <QtCompositor/qwaylandkeyboard.h>
-#include <QtCompositor/qwaylanddestroylistener.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandinput.h>
+#include <QtWaylandCompositor/qwaylandkeyboard.h>
+#include <QtWaylandCompositor/qwaylanddestroylistener.h>
#include <QtCore/private/qobject_p.h>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
#include <QtCore/QVector>
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index f35e6e7d..2b027cdd 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -38,11 +38,11 @@
#include "qwaylandoutput.h"
#include "qwaylandoutput_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandView>
-#include <QtCompositor/private/qwaylandsurface_p.h>
-#include <QtCompositor/private/qwaylandoutputspace_p.h>
+#include <QtWaylandCompositor/private/qwaylandsurface_p.h>
+#include <QtWaylandCompositor/private/qwaylandoutputspace_p.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QtMath>
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index edb08d22..5f4d9fab 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -38,7 +38,7 @@
#ifndef QWAYLANDOUTPUT_H
#define QWAYLANDOUTPUT_H
-#include <QtCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandextension.h>
#include <QtCore/QObject>
#include <QObject>
diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h
index 67e96381..01e67630 100644
--- a/src/compositor/compositor_api/qwaylandoutput_p.h
+++ b/src/compositor/compositor_api/qwaylandoutput_p.h
@@ -39,13 +39,13 @@
#ifndef QWAYLANDOUTPUT_P_H
#define QWAYLANDOUTPUT_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/QWaylandOutput>
-#include <QtCompositor/QWaylandClient>
-#include <QtCompositor/QWaylandOutputSpace>
-#include <QtCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandOutputSpace>
+#include <QtWaylandCompositor/QWaylandSurface>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
#include <QtCore/QRect>
#include <QtCore/QVector>
diff --git a/src/compositor/compositor_api/qwaylandoutputspace.cpp b/src/compositor/compositor_api/qwaylandoutputspace.cpp
index 29c91ac0..b5a45cb1 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace.cpp
+++ b/src/compositor/compositor_api/qwaylandoutputspace.cpp
@@ -37,8 +37,8 @@
#include "qwaylandoutputspace.h"
#include "qwaylandoutputspace_p.h"
#include "qwaylandcompositor.h"
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandOutput>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandoutputspace.h b/src/compositor/compositor_api/qwaylandoutputspace.h
index 9b45f7db..8531c229 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace.h
+++ b/src/compositor/compositor_api/qwaylandoutputspace.h
@@ -39,7 +39,7 @@
#include <QtCore/QObject>
-#include <QtCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/QWaylandOutput>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandoutputspace_p.h b/src/compositor/compositor_api/qwaylandoutputspace_p.h
index 0589ac80..4f155796 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace_p.h
+++ b/src/compositor/compositor_api/qwaylandoutputspace_p.h
@@ -41,10 +41,10 @@
#include "qwaylandoutputspace.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandOutput>
-#include <QtCompositor/private/qwaylandcompositor_p.h>
-#include <QtCompositor/private/qwaylandoutput_p.h>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwaylandoutput_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp
index f1a82ff8..5cec6fca 100644
--- a/src/compositor/compositor_api/qwaylandpointer.cpp
+++ b/src/compositor/compositor_api/qwaylandpointer.cpp
@@ -36,8 +36,8 @@
#include "qwaylandpointer.h"
#include "qwaylandpointer_p.h"
-#include <QtCompositor/QWaylandClient>
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandCompositor>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h
index c43ab773..0b78460a 100644
--- a/src/compositor/compositor_api/qwaylandpointer.h
+++ b/src/compositor/compositor_api/qwaylandpointer.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDPOINTER_H
#define QWAYLANDPOINTER_H
-#include <QtCompositor/QWaylandExtensionContainer>
+#include <QtWaylandCompositor/QWaylandExtensionContainer>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandpointer_p.h b/src/compositor/compositor_api/qwaylandpointer_p.h
index 769b0f91..d416c622 100644
--- a/src/compositor/compositor_api/qwaylandpointer_p.h
+++ b/src/compositor/compositor_api/qwaylandpointer_p.h
@@ -38,19 +38,19 @@
#ifndef QWAYLANDPOINTER_P_H
#define QWAYLANDPOINTER_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/QWaylandDestroyListener>
-#include <QtCompositor/QWaylandPointer>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandDestroyListener>
+#include <QtWaylandCompositor/QWaylandPointer>
#include <QtCore/QList>
#include <QtCore/QPoint>
#include <QtCore/QObject>
#include <QtCore/private/qobject_p.h>
-#include <QtCompositor/private/qwayland-server-wayland.h>
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/QWaylandSurface>
-#include <QtCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandInputDevice>
#include <stdint.h>
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 70afccb9..e909caae 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -43,7 +43,7 @@
#include "qwaylandquickoutput.h"
#include "qwaylandquickitem.h"
#include "qwaylandoutput.h"
-#include <QtCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h
index eff0b2f3..87650810 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.h
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDQUICKCOMPOSITOR_H
#define QWAYLANDQUICKCOMPOSITOR_H
-#include <QtCompositor/qwaylandcompositor.h>
+#include <QtWaylandCompositor/qwaylandcompositor.h>
#include <QtQml/QQmlParserStatus>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index d02b505b..3a60f851 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -36,10 +36,10 @@
#include "qwaylandquickitem.h"
#include "qwaylandquicksurface.h"
-#include <QtCompositor/qwaylandcompositor.h>
-#include <QtCompositor/qwaylandinput.h>
-#include <QtCompositor/qwaylandbufferref.h>
-#include <QtCompositor/private/qwlclientbufferintegration_p.h>
+#include <QtWaylandCompositor/qwaylandcompositor.h>
+#include <QtWaylandCompositor/qwaylandinput.h>
+#include <QtWaylandCompositor/qwaylandbufferref.h>
+#include <QtWaylandCompositor/private/qwlclientbufferintegration_p.h>
#include <QtGui/QKeyEvent>
#include <QtGui/QGuiApplication>
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h
index 1fb8f45b..e81bba78 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.h
+++ b/src/compositor/compositor_api/qwaylandquickitem.h
@@ -37,15 +37,15 @@
#ifndef QWAYLANDSURFACEITEM_H
#define QWAYLANDSURFACEITEM_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtQuick/QQuickItem>
#include <QtQuick/qsgtexture.h>
#include <QtQuick/qsgtextureprovider.h>
-#include <QtCompositor/qwaylandview.h>
-#include <QtCompositor/qwaylandquicksurface.h>
+#include <QtWaylandCompositor/qwaylandview.h>
+#include <QtWaylandCompositor/qwaylandquicksurface.h>
Q_DECLARE_METATYPE(QWaylandQuickSurface*)
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.h b/src/compositor/compositor_api/qwaylandquickoutput.h
index 05cb42ed..0fcd4a19 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.h
+++ b/src/compositor/compositor_api/qwaylandquickoutput.h
@@ -39,7 +39,7 @@
#define QWAYLANDQUICKOUTPUT_H
#include <QtQuick/QQuickWindow>
-#include <QtCompositor/qwaylandoutput.h>
+#include <QtWaylandCompositor/qwaylandoutput.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index 10e1ed5b..7d01b8fd 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -42,12 +42,12 @@
#include "qwaylandquicksurface.h"
#include "qwaylandquickcompositor.h"
#include "qwaylandquickitem.h"
-#include <QtCompositor/qwaylandbufferref.h>
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/private/qwaylandsurface_p.h>
+#include <QtWaylandCompositor/qwaylandbufferref.h>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/private/qwaylandsurface_p.h>
-#include <QtCompositor/private/qwayland-server-surface-extension.h>
-#include <QtCompositor/private/qwlextendedsurface_p.h>
+#include <QtWaylandCompositor/private/qwayland-server-surface-extension.h>
+#include <QtWaylandCompositor/private/qwlextendedsurface_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h
index e88aa588..ba53c82f 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.h
+++ b/src/compositor/compositor_api/qwaylandquicksurface.h
@@ -37,7 +37,7 @@
#ifndef QQUICKWAYLANDSURFACE_H
#define QQUICKWAYLANDSURFACE_H
-#include <QtCompositor/qwaylandsurface.h>
+#include <QtWaylandCompositor/qwaylandsurface.h>
struct wl_client;
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 58312de5..72575b9d 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -44,14 +44,14 @@
#include "extensions/qwlextendedsurface_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandClient>
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/QWaylandBufferRef>
-
-#include <QtCompositor/private/qwaylandcompositor_p.h>
-#include <QtCompositor/private/qwaylandview_p.h>
-#include <QtCompositor/private/qwaylandinput_p.h>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandBufferRef>
+
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwaylandview_p.h>
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
#include <QtCore/private/qobject_p.h>
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index 11028590..12209673 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -38,9 +38,9 @@
#ifndef QWAYLANDSURFACE_H
#define QWAYLANDSURFACE_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandextension.h>
-#include <QtCompositor/qwaylandclient.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandclient.h>
#include <QtCore/QScopedPointer>
#include <QtGui/QImage>
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h
index 29117852..69bdb7dc 100644
--- a/src/compositor/compositor_api/qwaylandsurface_p.h
+++ b/src/compositor/compositor_api/qwaylandsurface_p.h
@@ -38,15 +38,15 @@
#ifndef QWAYLANDSURFACE_P_H
#define QWAYLANDSURFACE_P_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <private/qobject_p.h>
#include <private/qwlsurfacebuffer_p.h>
-#include <QtCompositor/qwaylandsurface.h>
-#include <QtCompositor/qwaylandbufferref.h>
+#include <QtWaylandCompositor/qwaylandsurface.h>
+#include <QtWaylandCompositor/qwaylandbufferref.h>
-#include <QtCompositor/private/qwlinputpanelsurface_p.h>
-#include <QtCompositor/private/qwlregion_p.h>
+#include <QtWaylandCompositor/private/qwlinputpanelsurface_p.h>
+#include <QtWaylandCompositor/private/qwlregion_p.h>
#include <QtCore/QVector>
#include <QtCore/QRect>
@@ -59,7 +59,7 @@
#include <wayland-util.h>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp
index a5e35ae7..61a018b0 100644
--- a/src/compositor/compositor_api/qwaylandtouch.cpp
+++ b/src/compositor/compositor_api/qwaylandtouch.cpp
@@ -37,12 +37,12 @@
#include "qwaylandtouch.h"
#include "qwaylandtouch_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandInputDevice>
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandClient>
-#include <QtCompositor/private/qwlqttouch_p.h>
+#include <QtWaylandCompositor/private/qwlqttouch_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h
index 572eb2d6..6f9f18da 100644
--- a/src/compositor/compositor_api/qwaylandtouch.h
+++ b/src/compositor/compositor_api/qwaylandtouch.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDTOUCH_H
#define QWAYLANDTOUCH_H
-#include <QtCompositor/QWaylandExtensionContainer>
+#include <QtWaylandCompositor/QWaylandExtensionContainer>
#include <QtCore/QObject>
#include <QtGui/QTouchEvent>
diff --git a/src/compositor/compositor_api/qwaylandtouch_p.h b/src/compositor/compositor_api/qwaylandtouch_p.h
index 93422169..45447150 100644
--- a/src/compositor/compositor_api/qwaylandtouch_p.h
+++ b/src/compositor/compositor_api/qwaylandtouch_p.h
@@ -38,17 +38,17 @@
#ifndef QTWAYLAND_QWLTOUCH_P_H
#define QTWAYLAND_QWLTOUCH_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/QWaylandDestroyListener>
-#include <QtCompositor/QWaylandTouch>
-#include <QtCompositor/QWaylandInputDevice>
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandDestroyListener>
+#include <QtWaylandCompositor/QWaylandTouch>
+#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include <QtCore/QPoint>
#include <QtCore/private/qobject_p.h>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp
index fa137192..ecc337bb 100644
--- a/src/compositor/compositor_api/qwaylandview.cpp
+++ b/src/compositor/compositor_api/qwaylandview.cpp
@@ -38,9 +38,9 @@
#include "qwaylandview_p.h"
#include "qwaylandsurface.h"
#include "qwaylandsurface_p.h"
-#include <QtCompositor/QWaylandInputDevice>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/private/qwaylandoutputspace_p.h>
+#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/private/qwaylandoutputspace_p.h>
#include <QtCore/QMutex>
diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h
index bc7eea76..47d1f911 100644
--- a/src/compositor/compositor_api/qwaylandview.h
+++ b/src/compositor/compositor_api/qwaylandview.h
@@ -37,8 +37,8 @@
#ifndef QWAYLANDSURFACEVIEW_H
#define QWAYLANDSURFACEVIEW_H
-#include <QtCompositor/QWaylandBufferRef>
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandBufferRef>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtCore/QPointF>
#include <QtCore/QObject>
diff --git a/src/compositor/compositor_api/qwaylandview_p.h b/src/compositor/compositor_api/qwaylandview_p.h
index b31c3711..a4a75a6c 100644
--- a/src/compositor/compositor_api/qwaylandview_p.h
+++ b/src/compositor/compositor_api/qwaylandview_p.h
@@ -41,7 +41,7 @@
#include <QtCore/QMutex>
#include <QtCore/private/qobject_p.h>
-#include <QtCompositor/QWaylandBufferRef>
+#include <QtWaylandCompositor/QWaylandBufferRef>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp
index d726d301..25e5e4ec 100644
--- a/src/compositor/extensions/qwaylandshell.cpp
+++ b/src/compositor/extensions/qwaylandshell.cpp
@@ -38,11 +38,11 @@
#include "qwaylandshell.h"
#include "qwaylandshell_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandView>
-#include <QtCompositor/QWaylandOutput>
-#include <QtCompositor/QWaylandOutputSpace>
-#include <QtCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandView>
+#include <QtWaylandCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/QWaylandOutputSpace>
+#include <QtWaylandCompositor/QWaylandClient>
#include <QtCore/QObject>
#include <QtCore/QDebug>
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h
index 30e87ed5..5af9d542 100644
--- a/src/compositor/extensions/qwaylandshell.h
+++ b/src/compositor/extensions/qwaylandshell.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDSHELL_H
#define QWAYLANDSHELL_H
-#include <QtCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandExtension>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandshell_p.h b/src/compositor/extensions/qwaylandshell_p.h
index 4aeef67f..e87a2756 100644
--- a/src/compositor/extensions/qwaylandshell_p.h
+++ b/src/compositor/extensions/qwaylandshell_p.h
@@ -37,19 +37,19 @@
#ifndef QWAYLANDSHELL_P_H
#define QWAYLANDSHELL_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandsurface.h>
-#include <QtCompositor/private/qwaylandextension_p.h>
-#include <QtCompositor/QWaylandPointerGrabber>
-#include <QtCompositor/QWaylandShellSurface>
-#include <QtCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandsurface.h>
+#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/QWaylandPointerGrabber>
+#include <QtWaylandCompositor/QWaylandShellSurface>
+#include <QtWaylandCompositor/QWaylandInputDevice>
#include <wayland-server.h>
#include <QHash>
#include <QPoint>
#include <QSet>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
index f8ba5e40..9050610d 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
@@ -37,8 +37,8 @@
#include "qwaylandwindowmanagerextension.h"
#include "qwaylandwindowmanagerextension_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandClient>
#include <QtCore/QUrl>
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.h b/src/compositor/extensions/qwaylandwindowmanagerextension.h
index a4761117..48fcbef3 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension.h
@@ -37,8 +37,8 @@
#ifndef WAYLANDWINDOWMANAGERINTEGRATION_H
#define WAYLANDWINDOWMANAGERINTEGRATION_H
-#include <QtCompositor/qwaylandextension.h>
-#include <QtCompositor/QWaylandClient>
+#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/QWaylandClient>
#include <QtCore/QUrl>
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
index 08638e5b..02f71998 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
@@ -37,9 +37,9 @@
#ifndef QWAYLANDWINDOWMANAGEREXTENSION_P_H
#define QWAYLANDWINDOWMANAGEREXTENSION_P_H
-#include <QtCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwaylandextension_p.h>
-#include <QtCompositor/private/qwayland-server-windowmanager.h>
+#include <QtWaylandCompositor/private/qwayland-server-windowmanager.h>
#include <QMap>
diff --git a/src/compositor/extensions/qwlextendedsurface.cpp b/src/compositor/extensions/qwlextendedsurface.cpp
index 2f4b551e..f619ec33 100644
--- a/src/compositor/extensions/qwlextendedsurface.cpp
+++ b/src/compositor/extensions/qwlextendedsurface.cpp
@@ -36,7 +36,7 @@
#include "qwlextendedsurface_p.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h
index fff51740..80e9b231 100644
--- a/src/compositor/extensions/qwlextendedsurface_p.h
+++ b/src/compositor/extensions/qwlextendedsurface_p.h
@@ -39,9 +39,9 @@
#include <wayland-server.h>
-#include <QtCompositor/private/qwayland-server-surface-extension.h>
-#include <QtCompositor/qwaylandsurface.h>
-#include <QtCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/private/qwayland-server-surface-extension.h>
+#include <QtWaylandCompositor/qwaylandsurface.h>
+#include <QtWaylandCompositor/qwaylandextension.h>
#include <QtCore/QVariant>
#include <QtCore/QLinkedList>
diff --git a/src/compositor/extensions/qwlinputmethod.cpp b/src/compositor/extensions/qwlinputmethod.cpp
index 6029112f..6cf23bcb 100644
--- a/src/compositor/extensions/qwlinputmethod.cpp
+++ b/src/compositor/extensions/qwlinputmethod.cpp
@@ -36,9 +36,9 @@
#include "qwlinputmethod_p.h"
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandKeyboard>
-#include <QtCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandKeyboard>
+#include <QtWaylandCompositor/QWaylandInputDevice>
#include "qwlinputmethodcontext_p.h"
#include "qwlinputpanel_p.h"
#include "qwltextinput_p.h"
diff --git a/src/compositor/extensions/qwlinputmethod_p.h b/src/compositor/extensions/qwlinputmethod_p.h
index 4d8ab78a..2bddbd4f 100644
--- a/src/compositor/extensions/qwlinputmethod_p.h
+++ b/src/compositor/extensions/qwlinputmethod_p.h
@@ -37,14 +37,14 @@
#ifndef QTWAYLAND_QWLINPUTMETHOD_H
#define QTWAYLAND_QWLINPUTMETHOD_H
-#include <QtCompositor/private/qwayland-server-input-method.h>
-#include <QtCompositor/QWaylandExtension>
-#include <QtCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/private/qwayland-server-input-method.h>
+#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandInputDevice>
#include <QObject>
#include <QScopedPointer>
-#include <QtCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandSurface>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwlinputmethodcontext_p.h b/src/compositor/extensions/qwlinputmethodcontext_p.h
index 8853d40b..4165939f 100644
--- a/src/compositor/extensions/qwlinputmethodcontext_p.h
+++ b/src/compositor/extensions/qwlinputmethodcontext_p.h
@@ -37,7 +37,7 @@
#ifndef QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H
#define QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H
-#include <QtCompositor/private/qwayland-server-input-method.h>
+#include <QtWaylandCompositor/private/qwayland-server-input-method.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwlinputpanel.cpp b/src/compositor/extensions/qwlinputpanel.cpp
index c5d96252..5c6fb27c 100644
--- a/src/compositor/extensions/qwlinputpanel.cpp
+++ b/src/compositor/extensions/qwlinputpanel.cpp
@@ -36,8 +36,8 @@
#include "qwlinputpanel_p.h"
-#include <QtCompositor/qwaylandinputpanel.h>
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/qwaylandinputpanel.h>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include "qwlinputmethod_p.h"
#include "qwlinputpanelsurface_p.h"
diff --git a/src/compositor/extensions/qwlinputpanel_p.h b/src/compositor/extensions/qwlinputpanel_p.h
index 1cb6f383..95d6a0a2 100644
--- a/src/compositor/extensions/qwlinputpanel_p.h
+++ b/src/compositor/extensions/qwlinputpanel_p.h
@@ -37,11 +37,11 @@
#ifndef QTWAYLAND_QWLINPUTPANEL_P_H
#define QTWAYLAND_QWLINPUTPANEL_P_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandinputpanel.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandinputpanel.h>
-#include <QtCompositor/private/qwaylandextension_p.h>
-#include <QtCompositor/private/qwayland-server-input-method.h>
+#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwayland-server-input-method.h>
#include <QRect>
#include <QScopedPointer>
diff --git a/src/compositor/extensions/qwlinputpanelsurface.cpp b/src/compositor/extensions/qwlinputpanelsurface.cpp
index 17f6fe7e..c54520aa 100644
--- a/src/compositor/extensions/qwlinputpanelsurface.cpp
+++ b/src/compositor/extensions/qwlinputpanelsurface.cpp
@@ -37,8 +37,8 @@
#include "qwlinputpanelsurface_p.h"
-#include <QtCompositor/private/qwaylandsurface_p.h>
-#include <QtCompositor/QWaylandOutput>
+#include <QtWaylandCompositor/private/qwaylandsurface_p.h>
+#include <QtWaylandCompositor/QWaylandOutput>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwlinputpanelsurface_p.h b/src/compositor/extensions/qwlinputpanelsurface_p.h
index 2992b803..7c76ef88 100644
--- a/src/compositor/extensions/qwlinputpanelsurface_p.h
+++ b/src/compositor/extensions/qwlinputpanelsurface_p.h
@@ -38,7 +38,7 @@
#ifndef QTWAYLAND_QWLINPUTPANELSURFACE_P_H
#define QTWAYLAND_QWLINPUTPANELSURFACE_P_H
-#include <QtCompositor/private/qwayland-server-input-method.h>
+#include <QtWaylandCompositor/private/qwayland-server-input-method.h>
#include <QWaylandSurface>
diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp
index 90bb83b3..52373df0 100644
--- a/src/compositor/extensions/qwlqtkey.cpp
+++ b/src/compositor/extensions/qwlqtkey.cpp
@@ -35,7 +35,7 @@
****************************************************************************/
#include "qwlqtkey_p.h"
-#include <QtCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandSurface>
#include <QKeyEvent>
#include <QWindow>
diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h
index decb1975..23847234 100644
--- a/src/compositor/extensions/qwlqtkey_p.h
+++ b/src/compositor/extensions/qwlqtkey_p.h
@@ -39,9 +39,9 @@
#include "wayland-util.h"
-#include <QtCompositor/QWaylandExtensionTemplate>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/private/qwayland-server-qtkey-extension.h>
+#include <QtWaylandCompositor/QWaylandExtensionTemplate>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/private/qwayland-server-qtkey-extension.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h
index 46afebfa..c9be2c00 100644
--- a/src/compositor/extensions/qwlqttouch_p.h
+++ b/src/compositor/extensions/qwlqttouch_p.h
@@ -37,9 +37,9 @@
#ifndef WLTOUCH_H
#define WLTOUCH_H
-#include <QtCompositor/private/qwayland-server-touch-extension.h>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/QWaylandExtensionTemplate>
+#include <QtWaylandCompositor/private/qwayland-server-touch-extension.h>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandExtensionTemplate>
#include "wayland-util.h"
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwltextinput.cpp b/src/compositor/extensions/qwltextinput.cpp
index 03c67bbd..a9ad7bbb 100644
--- a/src/compositor/extensions/qwltextinput.cpp
+++ b/src/compositor/extensions/qwltextinput.cpp
@@ -39,9 +39,9 @@
#include "qwlinputmethod_p.h"
#include "qwlinputmethodcontext_p.h"
#include "qwlinputpanel_p.h"
-#include <QtCompositor/QWaylandInputPanel>
-#include <QtCompositor/QWaylandCompositor>
-#include <QtCompositor/private/qwaylandinput_p.h>
+#include <QtWaylandCompositor/QWaylandInputPanel>
+#include <QtWaylandCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
#include <algorithm>
diff --git a/src/compositor/extensions/qwltextinput_p.h b/src/compositor/extensions/qwltextinput_p.h
index 8f51622f..359227a4 100644
--- a/src/compositor/extensions/qwltextinput_p.h
+++ b/src/compositor/extensions/qwltextinput_p.h
@@ -37,8 +37,8 @@
#ifndef QTWAYLAND_QWLTEXTINPUT_P_H
#define QTWAYLAND_QWLTEXTINPUT_P_H
-#include <QtCompositor/QWaylandExtension>
-#include <QtCompositor/private/qwayland-server-text.h>
+#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/private/qwayland-server-text.h>
#include <QRect>
diff --git a/src/compositor/extensions/qwltextinputmanager.cpp b/src/compositor/extensions/qwltextinputmanager.cpp
index cbffbf12..9c7dd72f 100644
--- a/src/compositor/extensions/qwltextinputmanager.cpp
+++ b/src/compositor/extensions/qwltextinputmanager.cpp
@@ -36,7 +36,7 @@
#include "qwltextinputmanager_p.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include "qwltextinput_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwltextinputmanager_p.h b/src/compositor/extensions/qwltextinputmanager_p.h
index 1702166c..30557e7b 100644
--- a/src/compositor/extensions/qwltextinputmanager_p.h
+++ b/src/compositor/extensions/qwltextinputmanager_p.h
@@ -37,8 +37,8 @@
#ifndef QTWAYLAND_QWLTEXTINPUTMANAGER_P_H
#define QTWAYLAND_QWLTEXTINPUTMANAGER_P_H
-#include <QtCompositor/QWaylandExtension>
-#include <QtCompositor/private/qwayland-server-text.h>
+#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/private/qwayland-server-text.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h
index f597cd9a..992e44cf 100644
--- a/src/compositor/global/qwaylandextension.h
+++ b/src/compositor/global/qwaylandextension.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDEXTENSION_H
#define QWAYLANDEXTENSION_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <wayland-server.h>
#include <QtCore/QObject>
diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h
index 10023aec..6b5bed9c 100644
--- a/src/compositor/global/qwaylandquickextension.h
+++ b/src/compositor/global/qwaylandquickextension.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDQUICKEXTENSION_H
#define QWAYLANDQUICKEXTENSION_H
-#include <QtCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandExtension>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
index b7614fd7..9cbbe6de 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
@@ -37,8 +37,8 @@
#ifndef QWAYLANDCLIENTBUFFERINTEGRATION_H
#define QWAYLANDCLIENTBUFFERINTEGRATION_H
-#include <QtCompositor/qwaylandexport.h>
-#include <QtCompositor/qwaylandsurface.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandsurface.h>
#include <QtCore/QSize>
#include <QtGui/qopengl.h>
#include <QtGui/QOpenGLContext>
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
index 165d96e6..0b1f3bfc 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
#define QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
index 4ac84b5a..868cea85 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
#define QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
@@ -48,7 +48,7 @@ namespace QtWayland {
class ClientBufferIntegration;
-#define QtWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QtWaylandClientBufferIntegrationFactoryInterface.5.3"
+#define QtWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandCompositor.QtWaylandClientBufferIntegrationFactoryInterface.5.3"
class Q_COMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject
{
diff --git a/src/compositor/hardware_integration/qwlhwintegration.cpp b/src/compositor/hardware_integration/qwlhwintegration.cpp
index 84cbf580..a163d4c2 100644
--- a/src/compositor/hardware_integration/qwlhwintegration.cpp
+++ b/src/compositor/hardware_integration/qwlhwintegration.cpp
@@ -36,7 +36,7 @@
#include "qwlhwintegration_p.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h
index d3077ef5..181be244 100644
--- a/src/compositor/hardware_integration/qwlhwintegration_p.h
+++ b/src/compositor/hardware_integration/qwlhwintegration_p.h
@@ -37,9 +37,9 @@
#ifndef QWLHWINTEGRATION_P_H
#define QWLHWINTEGRATION_P_H
-#include <QtCompositor/private/qwayland-server-hardware-integration.h>
+#include <QtWaylandCompositor/private/qwayland-server-hardware-integration.h>
-#include <QtCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandExtension>
#include <QtCore/QString>
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
index d21f1326..f4627db9 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
@@ -41,7 +41,7 @@
#include <QtCore/QSize>
#include <QtGui/qopengl.h>
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
struct wl_client;
struct wl_resource;
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
index 928e5d9a..b851e7c3 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H
#define QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
index d1bb3648..1f091585 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
@@ -37,7 +37,7 @@
#ifndef QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H
#define QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp
index 59f6dabb..4c32538e 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp
@@ -43,10 +43,10 @@
#include "qwaylanddrag.h"
#include "qwaylandview.h"
-#include <QtCompositor/QWaylandClient>
-#include <QtCompositor/private/qwaylandcompositor_p.h>
-#include <QtCompositor/private/qwaylandinput_p.h>
-#include <QtCompositor/private/qwaylandpointer_p.h>
+#include <QtWaylandCompositor/QWaylandClient>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
+#include <QtWaylandCompositor/private/qwaylandpointer_p.h>
#include <QtCore/QPointF>
#include <QDebug>
diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index dc8c3be2..11946df5 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h
@@ -37,10 +37,10 @@
#ifndef WLDATADEVICE_H
#define WLDATADEVICE_H
-#include <QtCompositor/private/qwayland-server-wayland.h>
-#include <QtCompositor/QWaylandPointerGrabber>
-#include <QtCompositor/QWaylandInputDevice>
-#include <QtCompositor/QWaylandOutputSpace>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/QWaylandPointerGrabber>
+#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandOutputSpace>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
index 56c7f802..3aa55ce1 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
@@ -36,10 +36,10 @@
#include "qwldatadevicemanager_p.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
-#include <QtCompositor/private/qwaylandcompositor_p.h>
-#include <QtCompositor/private/qwaylandinput_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwaylandinput_p.h>
#include "qwldatadevice_p.h"
#include "qwldatasource_p.h"
#include "qwldataoffer_p.h"
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
index 3bc50f64..e0109b28 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
@@ -42,9 +42,9 @@
#include <QtGui/QClipboard>
#include <QtCore/QMimeData>
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h
index 58400075..a7d17c82 100644
--- a/src/compositor/wayland_wrapper/qwldataoffer_p.h
+++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h
@@ -38,7 +38,7 @@
#define WLDATAOFFER_H
#include <QPointer>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwldatasource.cpp b/src/compositor/wayland_wrapper/qwldatasource.cpp
index 641b63b0..aa2af160 100644
--- a/src/compositor/wayland_wrapper/qwldatasource.cpp
+++ b/src/compositor/wayland_wrapper/qwldatasource.cpp
@@ -40,7 +40,7 @@
#include "qwldatadevicemanager_p.h"
#include <unistd.h>
-#include <QtCompositor/private/wayland-wayland-server-protocol.h>
+#include <QtWaylandCompositor/private/wayland-wayland-server-protocol.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h
index c183f0fe..4df13a2b 100644
--- a/src/compositor/wayland_wrapper/qwldatasource_p.h
+++ b/src/compositor/wayland_wrapper/qwldatasource_p.h
@@ -37,7 +37,7 @@
#ifndef WLDATASOURCE_H
#define WLDATASOURCE_H
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
#include <QObject>
#include <QtCore/QList>
diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h
index 2ea0f8f1..8867f2ff 100644
--- a/src/compositor/wayland_wrapper/qwlregion_p.h
+++ b/src/compositor/wayland_wrapper/qwlregion_p.h
@@ -37,12 +37,12 @@
#ifndef WL_REGION_H
#define WL_REGION_H
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
#include <QRegion>
#include <wayland-util.h>
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
index d65cbc56..dadc53b9 100644
--- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
@@ -46,7 +46,7 @@
#include <wayland-server-protocol.h>
#include "qwaylandshmformathelper.h"
-#include <QtCompositor/private/qwaylandcompositor_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
index ce2c2686..5a018563 100644
--- a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
@@ -42,7 +42,7 @@
#include <QImage>
#include <QAtomicInt>
-#include <QtCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandSurface>
#include <wayland-server.h>
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
index a825a1fd..ef6f613b 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
@@ -37,7 +37,7 @@
#ifndef BRCMBUFFER_H
#define BRCMBUFFER_H
-#include <QtCompositor/private/qwayland-server-wayland.h>
+#include <QtWaylandCompositor/private/qwayland-server-wayland.h>
#include <QtCore/QSize>
#include <QtCore/QVector>
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
index ed4cc441..5ed1a29c 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
@@ -36,8 +36,8 @@
#include "brcmeglintegration.h"
#include "brcmbuffer.h"
-#include <QtCompositor/private/qwlsurface_p.h>
-#include <QtCompositor/qwaylandsurface.h>
+#include <QtWaylandCompositor/private/qwlsurface_p.h>
+#include <QtWaylandCompositor/qwaylandsurface.h>
#include <qpa/qplatformnativeinterface.h>
#include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLContext>
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
index 68834315..90f447c5 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
@@ -37,7 +37,7 @@
#ifndef BRCMEGLINTEGRATION_H
#define BRCMEGLINTEGRATION_H
-#include <QtCompositor/private/qwlclientbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlclientbufferintegration_p.h>
#include "qwayland-server-brcm.h"
#include <QtCore/QScopedPointer>
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
index 84089f45..5cd7bcf5 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
@@ -37,7 +37,7 @@
#ifndef DRMEGLSERVERBUFFERINTEGRATION_H
#define DRMEGLSERVERBUFFERINTEGRATION_H
-#include <QtCompositor/private/qwlserverbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h>
#include "qwayland-server-drm-egl-server-buffer.h"
@@ -45,8 +45,8 @@
#include <QtGui/qpa/qplatformnativeinterface.h>
#include <QtGui/QGuiApplication>
-#include <QtCompositor/qwaylandcompositor.h>
-#include <QtCompositor/private/qwayland-server-server-buffer-extension.h>
+#include <QtWaylandCompositor/qwaylandcompositor.h>
+#include <QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h>
#include <QtCore/QDebug>
#include <EGL/egl.h>
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
index 131c538e..572c681b 100644
--- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
@@ -37,7 +37,7 @@
#ifndef LIBHYBRISEGLSERVERBUFFERINTEGRATION_H
#define LIBHYBRISEGLSERVERBUFFERINTEGRATION_H
-#include <QtCompositor/private/qwlserverbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h>
#include "qwayland-server-libhybris-egl-server-buffer.h"
@@ -45,8 +45,8 @@
#include <QtGui/qpa/qplatformnativeinterface.h>
#include <QtGui/QGuiApplication>
-#include <QtCompositor/qwaylandcompositor.h>
-#include <QtCompositor/private/qwayland-server-server-buffer-extension.h>
+#include <QtWaylandCompositor/qwaylandcompositor.h>
+#include <QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h>
#include <QtCore/QDebug>
#include <EGL/egl.h>
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index 93d9fb1f..b7aed26f 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -36,7 +36,7 @@
#include "waylandeglclientbufferintegration.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include <qpa/qplatformnativeinterface.h>
#include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLContext>
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index 16a1fef8..effde284 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -37,7 +37,7 @@
#ifndef WAYLANDEGLINTEGRATION_H
#define WAYLANDEGLINTEGRATION_H
-#include <QtCompositor/private/qwlclientbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlclientbufferintegration_p.h>
#include <QtCore/QScopedPointer>
QT_BEGIN_NAMESPACE
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
index 5b6143db..e858a8e7 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
@@ -38,7 +38,7 @@
#include "wayland-xcomposite-server-protocol.h"
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include <QtGui/QGuiApplication>
#include <qpa/qplatformnativeinterface.h>
#include <qpa/qplatformopenglcontext.h>
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index be493d77..c14e582e 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
@@ -37,9 +37,9 @@
#ifndef XCOMPOSITEEGLINTEGRATION_H
#define XCOMPOSITEEGLINTEGRATION_H
-#include <QtCompositor/private/qwlclientbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlclientbufferintegration_p.h>
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include "xlibinclude.h"
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 70b774ef..9caeb464 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -37,7 +37,7 @@
#ifndef XCOMPOSITEGLXINTEGRATION_H
#define XCOMPOSITEGLXINTEGRATION_H
-#include <QtCompositor/private/qwlclientbufferintegration_p.h>
+#include <QtWaylandCompositor/private/qwlclientbufferintegration_p.h>
#include "xlibinclude.h"
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
index 55e953ec..318b1787 100644
--- a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
@@ -38,8 +38,8 @@
#define XCOMPOSITEBUFFER_H
#include <qwayland-server-wayland.h>
-#include <QtCompositor/QWaylandSurface>
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include <QtCore/QSize>
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
index f474b8b7..482224b6 100644
--- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
+++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
@@ -37,7 +37,7 @@
#ifndef XCOMPOSITEHANDLER_H
#define XCOMPOSITEHANDLER_H
-#include <QtCompositor/QWaylandCompositor>
+#include <QtWaylandCompositor/QWaylandCompositor>
#include "xlibinclude.h"
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro
index 80bda74b..f6a444a2 100644
--- a/src/imports/compositor/compositor.pro
+++ b/src/imports/compositor/compositor.pro
@@ -41,6 +41,6 @@ RESOURCES += $$GENERATED_RESOURCE_FILE
CONFIG(debug, debug|release): QML_FILES += $$COMPOSITOR_QML_FILES
DEFINES += QT_COMPOSITOR_QUICK
-QT += quick-private qml-private gui-private core-private compositor compositor-private
+QT += quick-private qml-private gui-private core-private waylandcompositor waylandcompositor-private
load(qml_plugin)
diff --git a/src/imports/compositor/qwaylandmousetracker_p.h b/src/imports/compositor/qwaylandmousetracker_p.h
index 4270151c..e6e5a679 100644
--- a/src/imports/compositor/qwaylandmousetracker_p.h
+++ b/src/imports/compositor/qwaylandmousetracker_p.h
@@ -39,7 +39,7 @@
#include <QtQuick/private/qquickmousearea_p.h>
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/qwaylandexport.h>
QT_BEGIN_NAMESPACE
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 1c693000..8581b0a7 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -39,19 +39,19 @@
#include <QtQuick/QQuickItem>
-#include <QtCompositor/QWaylandQuickCompositor>
-#include <QtCompositor/QWaylandQuickItem>
-#include <QtCompositor/QWaylandQuickSurface>
-#include <QtCompositor/QWaylandClient>
-#include <QtCompositor/QWaylandQuickOutput>
-#include <QtCompositor/QWaylandOutputSpace>
-#include <QtCompositor/QWaylandExtension>
-#include <QtCompositor/QWaylandQuickExtension>
-#include <QtCompositor/QWaylandInputDevice>
-
-#include <QtCompositor/QWaylandShell>
-
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandQuickCompositor>
+#include <QtWaylandCompositor/QWaylandQuickItem>
+#include <QtWaylandCompositor/QWaylandQuickSurface>
+#include <QtWaylandCompositor/QWaylandClient>
+#include <QtWaylandCompositor/QWaylandQuickOutput>
+#include <QtWaylandCompositor/QWaylandOutputSpace>
+#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandQuickExtension>
+#include <QtWaylandCompositor/QWaylandInputDevice>
+
+#include <QtWaylandCompositor/QWaylandShell>
+
+#include <QtWaylandCompositor/qwaylandexport.h>
#include "qwaylandmousetracker_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
index f47898a4..74da1643 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 7996e4fe..a7d08199 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 4e269393..806e1fac 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 33bd82ef..2f7dae45 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 fb59c40a..7780df50 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 004cd6c8..f166536b 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 4f0e1ab1..d1cc75dd 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 98977591..614c1cfe 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 a8a36673..12d17639 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 059e462c..5475f204 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 acf45e16..e6fd96bb 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 d8d6f0e0..3441f271 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 4f5ec145..59d867f9 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
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 6d602ad0..131c5ca7 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -370,7 +370,6 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("#include <QByteArray>\n");
printf("#include <QMultiMap>\n");
printf("#include <QString>\n");
- printf("\n");
printf("\n");
printf("#ifndef WAYLAND_VERSION_CHECK\n");
@@ -382,9 +381,6 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("\n");
printf("QT_BEGIN_NAMESPACE\n");
- printf("\n");
- printf("class QWaylandExtensionContainer;\n");
- printf("\n");
QByteArray serverExport;
if (headerPath.size()) {
serverExport = QByteArray("Q_WAYLAND_SERVER_") + preProcessorProtocolName + "_EXPORT";
@@ -533,7 +529,6 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("#include \"qwayland-server-%s.h\"\n", QByteArray(protocolName).replace('_', '-').constData());
else
printf("#include <%s/qwayland-server-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData());
- printf("#include <QtCompositor/QWaylandExtension>\n");
printf("\n");
printf("QT_BEGIN_NAMESPACE\n");
printf("\n");
diff --git a/src/src.pro b/src/src.pro
index 6dc62e8e..bf5ffe36 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,18 +4,15 @@ sub_qtwaylandscanner.subdir = qtwaylandscanner
sub_qtwaylandscanner.target = sub-qtwaylandscanner
SUBDIRS += sub_qtwaylandscanner
-# Don't build QtCompositor API unless explicitly enabled
-contains(CONFIG, wayland-compositor) {
- sub_compositor.subdir = compositor
- sub_compositor.depends = sub-qtwaylandscanner
- sub_compositor.target = sub-compositor
- SUBDIRS += sub_compositor
+sub_compositor.subdir = compositor
+sub_compositor.depends = sub-qtwaylandscanner
+sub_compositor.target = sub-compositor
+SUBDIRS += sub_compositor
- sub_imports.subdir = imports
- sub_imports.depends += sub-client
- sub_imports.target = sub-imports
- SUBDIRS += sub_imports
-}
+sub_imports.subdir = imports
+sub_imports.depends += sub-compositor
+sub_imports.target = sub-imports
+SUBDIRS += sub_imports
sub_client.subdir = client
sub_client.depends = sub-qtwaylandscanner
@@ -23,7 +20,6 @@ sub_client.target = sub-client
SUBDIRS += sub_client
sub_plugins.subdir = plugins
-sub_plugins.depends = sub-qtwaylandscanner sub-client
-contains(CONFIG, wayland-compositor): sub_plugins.depends += sub-compositor
+sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor
sub_plugins.target = sub-plugins
SUBDIRS += sub_plugins
diff --git a/sync.profile b/sync.profile
index 9b90e4a9..6fee67e4 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
%modules = ( # path to module name map
- "QtCompositor" => "$basedir/src/compositor",
+ "QtWaylandCompositor" => "$basedir/src/compositor",
"QtWaylandClient" => "$basedir/src/client",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro
index 035beeb4..d5094d87 100644
--- a/tests/auto/compositor/compositor.pro
+++ b/tests/auto/compositor/compositor.pro
@@ -2,7 +2,7 @@ CONFIG += testcase link_pkgconfig
TARGET = tst_compositor
QT += testlib
-QT += core-private gui-private compositor compositor-private
+QT += core-private gui-private waylandcompositor waylandcompositor-private
!contains(QT_CONFIG, no-pkg-config) {
PKGCONFIG += wayland-client wayland-server