Use WaylandCompositor module name for export macro

Change-Id: Ieb65b66f28986845f50647ae338678f0a1e7a153
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Erik Larsson <erik@ortogonal.com>
Reviewed-by: Johan Helsing <johan.helsing@theqtcompany.com>

44 files changed, 56 insertions, 56 deletions

diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h
index 5683a0b31..a4a5df5e0 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.h
+++ b/src/compositor/compositor_api/qwaylandbufferref.h
@@ -55,7 +55,7 @@ namespace QtWayland
     class SurfaceBuffer;
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandBufferRef
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandBufferRef
 {
 public:
     QWaylandBufferRef();
diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h
index 800013d3d..26e7b95e5 100644
--- a/src/compositor/compositor_api/qwaylandclient.h
+++ b/src/compositor/compositor_api/qwaylandclient.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandClientPrivate;
 class QWaylandCompositor;
 
-class Q_COMPOSITOR_EXPORT QWaylandClient : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandClient : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandClient)
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 789832762..d8a5d9ca3 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -64,7 +64,7 @@ class QWaylandPointer;
 class QWaylandKeyboard;
 class QWaylandTouch;
 
-class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandCompositor)
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 942634af5..5a7f7e802 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -69,7 +69,7 @@ namespace QtWayland {
 class QWindowSystemEventHandler;
 class QWaylandSurface;
 
-class Q_COMPOSITOR_EXPORT QWaylandCompositorPrivate : public QObjectPrivate, public QtWaylandServer::wl_compositor, public QtWaylandServer::wl_subcompositor
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorPrivate : public QObjectPrivate, public QtWaylandServer::wl_compositor, public QtWaylandServer::wl_subcompositor
 {
 public:
     static QWaylandCompositorPrivate *get(QWaylandCompositor *compositor) { return compositor->d_func(); }
diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.h b/src/compositor/compositor_api/qwaylanddestroylistener.h
index 04e0546af..db172ae0b 100644
--- a/src/compositor/compositor_api/qwaylanddestroylistener.h
+++ b/src/compositor/compositor_api/qwaylanddestroylistener.h
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandDestroyListenerPrivate;
 
-class Q_COMPOSITOR_EXPORT QWaylandDestroyListener : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandDestroyListener : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandDestroyListener)
diff --git a/src/compositor/compositor_api/qwaylanddrag.h b/src/compositor/compositor_api/qwaylanddrag.h
index e7fcaad8e..00a2bee8e 100644
--- a/src/compositor/compositor_api/qwaylanddrag.h
+++ b/src/compositor/compositor_api/qwaylanddrag.h
@@ -53,7 +53,7 @@ namespace QtWayland {
     class DataDevice;
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandDrag : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandDrag : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandDrag)
diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h
index e4b6e1275..794585009 100644
--- a/src/compositor/compositor_api/qwaylandinput.h
+++ b/src/compositor/compositor_api/qwaylandinput.h
@@ -63,7 +63,7 @@ namespace QtWayland {
 class InputDevice;
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandInputDevice : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputDevice : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandInputDevice)
diff --git a/src/compositor/compositor_api/qwaylandinput_p.h b/src/compositor/compositor_api/qwaylandinput_p.h
index 4ae741d05..ec8742d15 100644
--- a/src/compositor/compositor_api/qwaylandinput_p.h
+++ b/src/compositor/compositor_api/qwaylandinput_p.h
@@ -85,7 +85,7 @@ class InputMethod;
 
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandInputDevicePrivate : public QObjectPrivate, public QtWaylandServer::wl_seat
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputDevicePrivate : public QObjectPrivate, public QtWaylandServer::wl_seat
 {
 public:
     Q_DECLARE_PUBLIC(QWaylandInputDevice)
diff --git a/src/compositor/compositor_api/qwaylandinputpanel.h b/src/compositor/compositor_api/qwaylandinputpanel.h
index cce1f4583..d29743140 100644
--- a/src/compositor/compositor_api/qwaylandinputpanel.h
+++ b/src/compositor/compositor_api/qwaylandinputpanel.h
@@ -49,7 +49,7 @@ class QWaylandCompositor;
 class QWaylandInputPanelPrivate;
 class QWaylandSurface;
 
-class Q_COMPOSITOR_EXPORT QWaylandInputPanel : public QWaylandExtensionTemplate<QWaylandInputPanel>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputPanel : public QWaylandExtensionTemplate<QWaylandInputPanel>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandInputPanel)
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h
index 3b2282ae7..89b13eeaf 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard.h
@@ -49,7 +49,7 @@ class QWaylandKeyboard;
 class QWaylandKeyboardPrivate;
 class QWaylandInputDevice;
 
-class Q_COMPOSITOR_EXPORT QWaylandKeymap
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeymap
 {
 public:
     QWaylandKeymap(const QString &layout = QString(), const QString &variant = QString(), const QString &options = QString(),
@@ -69,7 +69,7 @@ private:
     QString m_model;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandKeyboard : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeyboard : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandKeyboard)
diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
index 86e3e365f..8c61a5bf7 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
@@ -66,7 +66,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandKeyboardPrivate : public QObjectPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeyboardPrivate : public QObjectPrivate
                                                   , public QtWaylandServer::wl_keyboard
 {
 public:
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index fba9df24f..46c5ff97f 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -57,7 +57,7 @@ class QWaylandView;
 class QWaylandClient;
 class QWaylandOutputSpace;
 
-class Q_COMPOSITOR_EXPORT QWaylandOutput : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutput : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandOutput)
diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h
index c67e45a7f..9b6ba9076 100644
--- a/src/compositor/compositor_api/qwaylandoutput_p.h
+++ b/src/compositor/compositor_api/qwaylandoutput_p.h
@@ -92,7 +92,7 @@ struct QWaylandSurfaceViewMapper
     bool has_entered;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output
 {
 public:
     QWaylandOutputPrivate();
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h
index 78e2b527e..6aa31bd51 100644
--- a/src/compositor/compositor_api/qwaylandpointer.h
+++ b/src/compositor/compositor_api/qwaylandpointer.h
@@ -48,7 +48,7 @@ class QWaylandView;
 class QWaylandOutput;
 class QWaylandClient;
 
-class Q_COMPOSITOR_EXPORT QWaylandPointer : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandPointer : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandPointer)
diff --git a/src/compositor/compositor_api/qwaylandpointer_p.h b/src/compositor/compositor_api/qwaylandpointer_p.h
index 7748f98df..5ac030029 100644
--- a/src/compositor/compositor_api/qwaylandpointer_p.h
+++ b/src/compositor/compositor_api/qwaylandpointer_p.h
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandView;
 
-class Q_COMPOSITOR_EXPORT QWaylandPointerPrivate : public QObjectPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandPointerPrivate : public QObjectPrivate
                                                  , public QtWaylandServer::wl_pointer
 {
     Q_DECLARE_PUBLIC(QWaylandPointer)
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h
index 876508109..bf25adfbb 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.h
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.h
@@ -46,7 +46,7 @@ class QQuickWindow;
 class QWaylandQuickCompositorPrivate;
 class QWaylandView;
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, public QQmlParserStatus
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, public QQmlParserStatus
 {
     Q_INTERFACES(QQmlParserStatus)
     Q_OBJECT
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h
index 41f1d533e..7140a5340 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.h
+++ b/src/compositor/compositor_api/qwaylandquickitem.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandInputDevice;
 class QWaylandQuickItemPrivate;
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandQuickItem)
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.h b/src/compositor/compositor_api/qwaylandquickoutput.h
index 48f478456..83091e4c7 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.h
+++ b/src/compositor/compositor_api/qwaylandquickoutput.h
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandQuickCompositor;
 class QQuickWindow;
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickOutput : public QWaylandOutput
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickOutput : public QWaylandOutput
 {
     Q_OBJECT
     Q_PROPERTY(bool automaticFrameCallback READ automaticFrameCallback WRITE setAutomaticFrameCallback NOTIFY automaticFrameCallbackChanged)
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h
index ba53c82ff..cb423da36 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.h
+++ b/src/compositor/compositor_api/qwaylandquicksurface.h
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandQuickSurfacePrivate;
 class QWaylandQuickCompositor;
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandQuickSurface)
diff --git a/src/compositor/compositor_api/qwaylandresource.h b/src/compositor/compositor_api/qwaylandresource.h
index 1987c1106..bfb4b0969 100644
--- a/src/compositor/compositor_api/qwaylandresource.h
+++ b/src/compositor/compositor_api/qwaylandresource.h
@@ -44,7 +44,7 @@ struct wl_resource;
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandResource
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandResource
 {
     Q_GADGET
 public:
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index 1ca689c6c..ccafd1dd3 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -71,7 +71,7 @@ private:
     QByteArray m_name;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandSurface)
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h
index 32b5c181f..73057c54e 100644
--- a/src/compositor/compositor_api/qwaylandsurface_p.h
+++ b/src/compositor/compositor_api/qwaylandsurface_p.h
@@ -83,7 +83,7 @@ namespace QtWayland {
 class FrameCallback;
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandSurfacePrivate : public QObjectPrivate, public QtWaylandServer::wl_surface
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSurfacePrivate : public QObjectPrivate, public QtWaylandServer::wl_surface
 {
 public:
     static QWaylandSurfacePrivate *get(QWaylandSurface *surface);
diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h
index aa9ee34cb..9c235e4cd 100644
--- a/src/compositor/compositor_api/qwaylandtouch.h
+++ b/src/compositor/compositor_api/qwaylandtouch.h
@@ -50,7 +50,7 @@ class QWaylandInputDevice;
 class QWaylandView;
 class QWaylandClient;
 
-class Q_COMPOSITOR_EXPORT QWaylandTouch : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTouch : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandTouch)
diff --git a/src/compositor/compositor_api/qwaylandtouch_p.h b/src/compositor/compositor_api/qwaylandtouch_p.h
index fe36cd6e8..3c9e0ec93 100644
--- a/src/compositor/compositor_api/qwaylandtouch_p.h
+++ b/src/compositor/compositor_api/qwaylandtouch_p.h
@@ -63,7 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandTouchPrivate : public QObjectPrivate, public QtWaylandServer::wl_touch
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTouchPrivate : public QObjectPrivate, public QtWaylandServer::wl_touch
 {
     Q_DECLARE_PUBLIC(QWaylandTouch)
 public:
diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h
index 5a820fb50..010bace42 100644
--- a/src/compositor/compositor_api/qwaylandview.h
+++ b/src/compositor/compositor_api/qwaylandview.h
@@ -49,7 +49,7 @@ class QWaylandSurface;
 class QWaylandViewPrivate;
 class QWaylandOutput;
 
-class Q_COMPOSITOR_EXPORT QWaylandView : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandView : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandView)
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h
index a6f773bd4..f65172690 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandQuickShellSurfaceItemPrivate;
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItem : public QWaylandQuickItem
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItem : public QWaylandQuickItem
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandQuickShellSurfaceItem)
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index 510ff2c7c..22e0d8a6c 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 // We mean it.
 //
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItemPrivate : public QWaylandQuickItemPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItemPrivate : public QWaylandQuickItemPrivate
 {
 public:
     enum GrabberState {
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h
index 403d7ca93..6de141fef 100644
--- a/src/compositor/extensions/qwaylandshell.h
+++ b/src/compositor/extensions/qwaylandshell.h
@@ -52,7 +52,7 @@ class QWaylandInputDevice;
 class QWaylandOutput;
 class QWaylandSurfaceRole;
 
-class Q_COMPOSITOR_EXPORT QWaylandShell : public QWaylandExtensionTemplate<QWaylandShell>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandShell : public QWaylandExtensionTemplate<QWaylandShell>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandShell)
@@ -69,7 +69,7 @@ Q_SIGNALS:
     void createShellSurface(QWaylandSurface *surface, const QWaylandResource &resource);
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandShellSurface : public QWaylandExtensionTemplate<QWaylandShellSurface>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandShellSurface : public QWaylandExtensionTemplate<QWaylandShellSurface>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandShellSurface)
diff --git a/src/compositor/extensions/qwaylandshell_p.h b/src/compositor/extensions/qwaylandshell_p.h
index 24f2138e0..bfa8c4004 100644
--- a/src/compositor/extensions/qwaylandshell_p.h
+++ b/src/compositor/extensions/qwaylandshell_p.h
@@ -63,7 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandShellPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandShellPrivate
                                         : public QWaylandExtensionTemplatePrivate
                                         , public QtWaylandServer::wl_shell
 {
@@ -76,7 +76,7 @@ protected:
     void shell_get_shell_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) Q_DECL_OVERRIDE;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandShellSurfacePrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandShellSurfacePrivate
                                         : public QWaylandExtensionTemplatePrivate
                                         , public QtWaylandServer::wl_shell_surface
 {
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.h b/src/compositor/extensions/qwaylandwindowmanagerextension.h
index 48fcbef3e..8c222d4d8 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension.h
@@ -52,7 +52,7 @@ class QWaylandCompositor;
 
 class QWaylandWindowManagerExtensionPrivate;
 
-class Q_COMPOSITOR_EXPORT QWaylandWindowManagerExtension : public QWaylandExtensionTemplate<QWaylandWindowManagerExtension>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWindowManagerExtension : public QWaylandExtensionTemplate<QWaylandWindowManagerExtension>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandWindowManagerExtension)
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
index bbce28623..4beaaf466 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandWindowManagerExtensionPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::qt_windowmanager
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWindowManagerExtensionPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::qt_windowmanager
 {
     Q_DECLARE_PUBLIC(QWaylandWindowManagerExtension)
 public:
diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h
index 03b3b43b1..dad7d4708 100644
--- a/src/compositor/extensions/qwlextendedsurface_p.h
+++ b/src/compositor/extensions/qwlextendedsurface_p.h
@@ -67,7 +67,7 @@ namespace QtWayland {
 
 class ExtendedSurface;
 
-class Q_COMPOSITOR_EXPORT SurfaceExtensionGlobal : public QWaylandExtensionTemplate<SurfaceExtensionGlobal>, public QtWaylandServer::qt_surface_extension
+class Q_WAYLAND_COMPOSITOR_EXPORT SurfaceExtensionGlobal : public QWaylandExtensionTemplate<SurfaceExtensionGlobal>, public QtWaylandServer::qt_surface_extension
 {
     Q_OBJECT
 public:
@@ -83,7 +83,7 @@ private:
 
 };
 
-class Q_COMPOSITOR_EXPORT ExtendedSurface : public QWaylandExtensionTemplate<ExtendedSurface>, public QtWaylandServer::qt_extended_surface
+class Q_WAYLAND_COMPOSITOR_EXPORT ExtendedSurface : public QWaylandExtensionTemplate<ExtendedSurface>, public QtWaylandServer::qt_extended_surface
 {
     Q_OBJECT
     Q_PROPERTY(Qt::ScreenOrientations contentOrientationMask READ contentOrientationMask NOTIFY contentOrientationMaskChanged)
diff --git a/src/compositor/extensions/qwlinputpanel_p.h b/src/compositor/extensions/qwlinputpanel_p.h
index 963593dbc..97720f050 100644
--- a/src/compositor/extensions/qwlinputpanel_p.h
+++ b/src/compositor/extensions/qwlinputpanel_p.h
@@ -64,7 +64,7 @@ class TextInput;
 }
 
 
-class Q_COMPOSITOR_EXPORT QWaylandInputPanelPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::wl_input_panel
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputPanelPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::wl_input_panel
 {
     Q_DECLARE_PUBLIC(QWaylandInputPanel)
 public:
diff --git a/src/compositor/global/qwaylandexport.h b/src/compositor/global/qwaylandexport.h
index 9cad01673..ddfa6aa77 100644
--- a/src/compositor/global/qwaylandexport.h
+++ b/src/compositor/global/qwaylandexport.h
@@ -41,13 +41,13 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(Q_COMPOSITOR_EXPORT)
+#if !defined(Q_WAYLAND_COMPOSITOR_EXPORT)
 #  if defined(QT_SHARED) && defined(QT_BUILD_COMPOSITOR_LIB)
-#    define Q_COMPOSITOR_EXPORT Q_DECL_EXPORT
+#    define Q_WAYLAND_COMPOSITOR_EXPORT Q_DECL_EXPORT
 #  elif defined(QT_SHARED)
-#    define Q_COMPOSITOR_EXPORT Q_DECL_IMPORT
+#    define Q_WAYLAND_COMPOSITOR_EXPORT Q_DECL_IMPORT
 #  else
-#    define Q_COMPOSITOR_EXPORT
+#    define Q_WAYLAND_COMPOSITOR_EXPORT
 #  endif
 #endif
 
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h
index 4a2235d6e..ac5df8fd9 100644
--- a/src/compositor/global/qwaylandextension.h
+++ b/src/compositor/global/qwaylandextension.h
@@ -50,7 +50,7 @@ class QWaylandExtension;
 class QWaylandExtensionPrivate;
 class QWaylandExtensionTemplatePrivate;
 
-class Q_COMPOSITOR_EXPORT QWaylandObject : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandObject : public QObject
 {
 public:
     virtual ~QWaylandObject();
@@ -67,7 +67,7 @@ protected:
     QList<QWaylandExtension *> extension_vector;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandExtension : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtension : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandExtension)
@@ -92,7 +92,7 @@ protected:
 };
 
 template <typename T>
-class Q_COMPOSITOR_EXPORT QWaylandExtensionTemplate : public QWaylandExtension
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionTemplate : public QWaylandExtension
 {
     Q_DECLARE_PRIVATE(QWaylandExtensionTemplate)
 public:
diff --git a/src/compositor/global/qwaylandextension_p.h b/src/compositor/global/qwaylandextension_p.h
index f25b34bba..3aaf235c7 100644
--- a/src/compositor/global/qwaylandextension_p.h
+++ b/src/compositor/global/qwaylandextension_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandExtensionPrivate : public QObjectPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QWaylandExtension)
 
@@ -71,7 +71,7 @@ public:
     bool initialized;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandExtensionTemplatePrivate : public QWaylandExtensionPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionTemplatePrivate : public QWaylandExtensionPrivate
 {
 public:
     QWaylandExtensionTemplatePrivate()
diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h
index 6b5bed9c1..fb6c73c4a 100644
--- a/src/compositor/global/qwaylandquickextension.h
+++ b/src/compositor/global/qwaylandquickextension.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #define Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(className) \
-    class Q_COMPOSITOR_EXPORT className##QuickData : public className \
+    class Q_WAYLAND_COMPOSITOR_EXPORT className##QuickData : public className \
     { \
 /* qmake ignore Q_OBJECT */ \
         Q_OBJECT \
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     };
 
 #define Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(className) \
-    class Q_COMPOSITOR_EXPORT className##QuickExtension : public className \
+    class Q_WAYLAND_COMPOSITOR_EXPORT className##QuickExtension : public className \
     { \
 /* qmake ignore Q_OBJECT */ \
         Q_OBJECT \
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
index e5c6c108f..2dff20e8f 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
@@ -60,7 +60,7 @@ class QWaylandCompositor;
 namespace QtWayland {
 class Display;
 
-class Q_COMPOSITOR_EXPORT ClientBufferIntegration
+class Q_WAYLAND_COMPOSITOR_EXPORT ClientBufferIntegration
 {
 public:
     ClientBufferIntegration();
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
index 6608de261..3c1d856c7 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
@@ -57,7 +57,7 @@ namespace QtWayland {
 
 class ClientBufferIntegration;
 
-class Q_COMPOSITOR_EXPORT ClientBufferIntegrationFactory
+class Q_WAYLAND_COMPOSITOR_EXPORT ClientBufferIntegrationFactory
 {
 public:
     static QStringList keys(const QString &pluginPath = QString());
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
index 119ae0bfd..d8bc33fbe 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
@@ -61,7 +61,7 @@ class ClientBufferIntegration;
 
 #define QtWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandCompositor.QtWaylandClientBufferIntegrationFactoryInterface.5.3"
 
-class Q_COMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
index 53920a709..3a71f18f7 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
@@ -65,7 +65,7 @@ class QOpenGLContext;
 namespace QtWayland {
 class Display;
 
-class Q_COMPOSITOR_EXPORT ServerBuffer
+class Q_WAYLAND_COMPOSITOR_EXPORT ServerBuffer
 {
 public:
     enum Format {
@@ -89,7 +89,7 @@ protected:
     Format m_format;
 };
 
-class Q_COMPOSITOR_EXPORT ServerBufferIntegration
+class Q_WAYLAND_COMPOSITOR_EXPORT ServerBufferIntegration
 {
 public:
     ServerBufferIntegration();
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
index f66e4144f..b29ddd041 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
@@ -57,7 +57,7 @@ namespace QtWayland {
 
 class ServerBufferIntegration;
 
-class Q_COMPOSITOR_EXPORT ServerBufferIntegrationFactory
+class Q_WAYLAND_COMPOSITOR_EXPORT ServerBufferIntegrationFactory
 {
 public:
     static QStringList keys(const QString &pluginPath = QString());
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
index 0402d2700..fc8c3bf1e 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
@@ -61,7 +61,7 @@ class ServerBufferIntegration;
 
 #define QtWaylandServerBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QtWaylandServerBufferIntegrationFactoryInterface.5.3"
 
-class Q_COMPOSITOR_EXPORT ServerBufferIntegrationPlugin : public QObject
+class Q_WAYLAND_COMPOSITOR_EXPORT ServerBufferIntegrationPlugin : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h
index bc15378e3..ca14c7a51 100644
--- a/src/compositor/wayland_wrapper/qwlregion_p.h
+++ b/src/compositor/wayland_wrapper/qwlregion_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-class Q_COMPOSITOR_EXPORT Region : public QtWaylandServer::wl_region
+class Q_WAYLAND_COMPOSITOR_EXPORT Region : public QtWaylandServer::wl_region
 {
 public:
     Region(struct wl_client *client, uint32_t id);