From 66217476bbe9d61588d36dc95ba31fbad2e1a620 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 22 Apr 2022 13:54:11 -0700 Subject: [PATCH] QtWaylandClient: use the CMake exports.h support The one in qtwaylandglobal.h was wrong. It just happened to work on Linux because the lack of import wasn't an error... until GCC 12 with -mno-direct-extern-access. Pick-to: 6.3 Change-Id: If05aeeb7176e4f13af9afffd16e8535b469f9158 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/platforms/wayland/CMakeLists.txt | 1 + .../platforms/wayland/global/qwaylandclientextension.h | 4 ++-- .../wayland/global/qwaylandclientextension_p.h | 4 ++-- .../qwaylandclientbufferintegration_p.h | 2 +- .../qwaylandclientbufferintegrationfactory_p.h | 2 +- .../qwaylandclientbufferintegrationplugin_p.h | 2 +- .../qwaylandhardwareintegration_p.h | 2 +- .../qwaylandserverbufferintegration_p.h | 4 ++-- .../qwaylandserverbufferintegrationfactory_p.h | 2 +- .../qwaylandserverbufferintegrationplugin_p.h | 2 +- .../qwaylandinputdeviceintegration_p.h | 2 +- .../qwaylandinputdeviceintegrationfactory_p.h | 2 +- .../qwaylandinputdeviceintegrationplugin_p.h | 2 +- .../wayland/plugins/decorations/bradient/main.cpp | 2 +- .../qwaylandfullscreenshellv1integration.h | 2 +- .../qwaylandfullscreenshellv1surface.h | 2 +- .../wl-shell/qwaylandwlshellintegration_p.h | 2 +- .../wl-shell/qwaylandwlshellsurface_p.h | 2 +- .../xdg-shell/qwaylandxdgactivationv1_p.h | 4 ++-- .../xdg-shell/qwaylandxdgdecorationv1_p.h | 4 ++-- .../shellintegration/xdg-shell/qwaylandxdgshell_p.h | 4 ++-- .../xdg-shell/qwaylandxdgshellintegration_p.h | 2 +- src/plugins/platforms/wayland/qtwaylandclientglobal.h | 9 +-------- .../platforms/wayland/qwaylandabstractdecoration_p.h | 2 +- src/plugins/platforms/wayland/qwaylandbuffer_p.h | 2 +- src/plugins/platforms/wayland/qwaylandclipboard_p.h | 2 +- src/plugins/platforms/wayland/qwaylandcursor_p.h | 4 ++-- .../platforms/wayland/qwaylanddatadevicemanager_p.h | 2 +- src/plugins/platforms/wayland/qwaylanddataoffer_p.h | 2 +- src/plugins/platforms/wayland/qwaylanddatasource_p.h | 2 +- .../platforms/wayland/qwaylanddecorationfactory_p.h | 2 +- .../platforms/wayland/qwaylanddecorationplugin_p.h | 2 +- src/plugins/platforms/wayland/qwaylanddisplay_p.h | 4 ++-- src/plugins/platforms/wayland/qwaylanddnd_p.h | 2 +- .../platforms/wayland/qwaylandextendedsurface_p.h | 2 +- src/plugins/platforms/wayland/qwaylandinputdevice_p.h | 8 ++++---- src/plugins/platforms/wayland/qwaylandintegration_p.h | 2 +- .../platforms/wayland/qwaylandnativeinterface_p.h | 2 +- .../platforms/wayland/qwaylandpointergestures_p.h | 6 +++--- .../platforms/wayland/qwaylandprimaryselectionv1_p.h | 2 +- src/plugins/platforms/wayland/qwaylandqtkey_p.h | 2 +- src/plugins/platforms/wayland/qwaylandscreen_p.h | 4 ++-- src/plugins/platforms/wayland/qwaylandshellsurface_p.h | 2 +- src/plugins/platforms/wayland/qwaylandshm_p.h | 2 +- .../platforms/wayland/qwaylandshmbackingstore_p.h | 4 ++-- src/plugins/platforms/wayland/qwaylandshmwindow_p.h | 2 +- src/plugins/platforms/wayland/qwaylandsubsurface_p.h | 2 +- src/plugins/platforms/wayland/qwaylandtabletv2_p.h | 10 +++++----- src/plugins/platforms/wayland/qwaylandtouch_p.h | 2 +- src/plugins/platforms/wayland/qwaylandwindow_p.h | 2 +- .../wayland/qwaylandwindowmanagerintegration_p.h | 2 +- .../shellintegration/qwaylandshellintegration_p.h | 4 ++-- .../qwaylandshellintegrationfactory_p.h | 2 +- .../qwaylandshellintegrationplugin_p.h | 2 +- 54 files changed, 74 insertions(+), 80 deletions(-) diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt index 1041f31e15c..be6065c1449 100644 --- a/src/plugins/platforms/wayland/CMakeLists.txt +++ b/src/plugins/platforms/wayland/CMakeLists.txt @@ -6,6 +6,7 @@ qt_internal_add_module(WaylandClient PLUGIN_TYPES wayland-graphics-integration-client wayland-inputdevice-integration wayland-decoration-client wayland-shell-integration + GENERATE_CPP_EXPORTS SOURCES ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h ../shared/qwaylandmimehelper.cpp ../shared/qwaylandmimehelper_p.h diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.h b/src/plugins/platforms/wayland/global/qwaylandclientextension.h index 350e32a42f3..f9e5fe2a721 100644 --- a/src/plugins/platforms/wayland/global/qwaylandclientextension.h +++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.h @@ -55,7 +55,7 @@ class QWaylandIntegration; class QWaylandClientExtensionPrivate; class QWaylandClientExtensionTemplatePrivate; -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandClientExtension : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandClientExtension) @@ -82,7 +82,7 @@ protected Q_SLOTS: }; template -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionTemplate : public QWaylandClientExtension +class Q_WAYLANDCLIENT_EXPORT QWaylandClientExtensionTemplate : public QWaylandClientExtension { Q_DECLARE_PRIVATE(QWaylandClientExtensionTemplate) public: diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h index 621c14b7767..b57d28f1e1c 100644 --- a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h +++ b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate +class Q_WAYLANDCLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate { public: Q_DECLARE_PUBLIC(QWaylandClientExtension) @@ -72,7 +72,7 @@ public: bool active = false; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionTemplatePrivate : public QWaylandClientExtensionPrivate +class Q_WAYLANDCLIENT_EXPORT QWaylandClientExtensionTemplatePrivate : public QWaylandClientExtensionPrivate { public: QWaylandClientExtensionTemplatePrivate() diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h index 4bd78944206..0aa8cd91b87 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h @@ -65,7 +65,7 @@ namespace QtWaylandClient { class QWaylandWindow; class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandClientBufferIntegration { public: QWaylandClientBufferIntegration(); diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h index 0a616b0daa7..f471dcf8d0f 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h @@ -61,7 +61,7 @@ namespace QtWaylandClient { class QWaylandClientBufferIntegration; -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegrationFactory +class Q_WAYLANDCLIENT_EXPORT QWaylandClientBufferIntegrationFactory { public: static QStringList keys(); diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h index 640b92c2cae..e63bca41a22 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h @@ -66,7 +66,7 @@ class QWaylandClientBufferIntegration; #define QWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" -class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegrationPlugin : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandClientBufferIntegrationPlugin : public QObject { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h index ee0d1ea192d..aa72d5905f3 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h @@ -61,7 +61,7 @@ namespace QtWaylandClient { class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandHardwareIntegration : public QtWayland::qt_hardware_integration +class Q_WAYLANDCLIENT_EXPORT QWaylandHardwareIntegration : public QtWayland::qt_hardware_integration { public: QWaylandHardwareIntegration(struct ::wl_registry *registry, int id); diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h index b55ba982a38..2fbe3b4010b 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -66,7 +66,7 @@ namespace QtWaylandClient { class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBuffer +class Q_WAYLANDCLIENT_EXPORT QWaylandServerBuffer { public: enum Format { @@ -94,7 +94,7 @@ private: void *m_user_data = nullptr; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandServerBufferIntegration { public: QWaylandServerBufferIntegration(); diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h index 984f4f431f5..f41099895d9 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h @@ -61,7 +61,7 @@ namespace QtWaylandClient { class QWaylandServerBufferIntegration; -class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegrationFactory +class Q_WAYLANDCLIENT_EXPORT QWaylandServerBufferIntegrationFactory { public: static QStringList keys(); diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h index a34ea87653b..b82b487f15e 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h @@ -66,7 +66,7 @@ class QWaylandServerBufferIntegration; #define QWaylandServerBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandServerBufferIntegrationFactoryInterface.5.3" -class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegrationPlugin : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandServerBufferIntegrationPlugin : public QObject { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h index 40df80b0c41..f034abc1c4f 100644 --- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h +++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h @@ -63,7 +63,7 @@ namespace QtWaylandClient { class QWaylandDisplay; class QWaylandInputDevice; -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDeviceIntegration { public: QWaylandInputDeviceIntegration() {} diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h index ef7d12ab7e9..ac4fd713a2c 100644 --- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h +++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h @@ -61,7 +61,7 @@ namespace QtWaylandClient { class QWaylandInputDeviceIntegration; -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegrationFactory +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDeviceIntegrationFactory { public: static QStringList keys(); diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h index 4c6b6d4e232..374411a70dc 100644 --- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h +++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h @@ -66,7 +66,7 @@ class QWaylandInputDeviceIntegration; #define QWaylandInputDeviceIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandInputDeviceIntegrationFactoryInterface.5.3" -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegrationPlugin : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDeviceIntegrationPlugin : public QObject { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp b/src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp index 2a32df3442f..1a48247738c 100644 --- a/src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp +++ b/src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp @@ -68,7 +68,7 @@ enum Button Minimize }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstractDecoration +class Q_WAYLANDCLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstractDecoration { public: QWaylandBradientDecoration(); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1integration.h b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1integration.h index 131f9e72097..387a57f31b6 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1integration.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1integration.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class Q_WAYLAND_CLIENT_EXPORT QWaylandFullScreenShellV1Integration : public QWaylandShellIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandFullScreenShellV1Integration : public QWaylandShellIntegration { public: bool initialize(QWaylandDisplay *display) override; diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1surface.h b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1surface.h index 718e1e861a7..8e4baf32bb7 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1surface.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1surface.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class Q_WAYLAND_CLIENT_EXPORT QWaylandFullScreenShellV1Surface : public QWaylandShellSurface +class Q_WAYLANDCLIENT_EXPORT QWaylandFullScreenShellV1Surface : public QWaylandShellSurface { public: QWaylandFullScreenShellV1Surface(QtWayland::zwp_fullscreen_shell_v1 *shell, QWaylandWindow *window); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h index 3d76cc31073..974382af37e 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellIntegration : public QWaylandShellIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandWlShellIntegration : public QWaylandShellIntegration { public: QWaylandWlShellIntegration() {} diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h index ca7ba602c73..ef938a5560c 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h @@ -67,7 +67,7 @@ class QWaylandWindow; class QWaylandInputDevice; class QWaylandExtendedSurface; -class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellSurface : public QWaylandShellSurface +class Q_WAYLANDCLIENT_EXPORT QWaylandWlShellSurface : public QWaylandShellSurface , public QtWayland::wl_shell_surface { Q_OBJECT diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgactivationv1_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgactivationv1_p.h index 11ffe7d1eab..2d461f49601 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgactivationv1_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgactivationv1_p.h @@ -63,7 +63,7 @@ namespace QtWaylandClient { class QWaylandDisplay; class QWaylandSurface; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgActivationTokenV1 +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgActivationTokenV1 : public QObject, public QtWayland::xdg_activation_token_v1 { @@ -75,7 +75,7 @@ Q_SIGNALS: void done(const QString &token); }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgActivationV1 : public QtWayland::xdg_activation_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgActivationV1 : public QtWayland::xdg_activation_v1 { public: QWaylandXdgActivationV1(struct ::wl_registry *registry, uint32_t id, uint32_t availableVersion); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1_p.h index c3a13ce3291..8a334fc80cc 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1_p.h @@ -64,7 +64,7 @@ namespace QtWaylandClient { class QWaylandXdgToplevel; class QWaylandXdgToplevelDecorationV1; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgDecorationManagerV1 : public QtWayland::zxdg_decoration_manager_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgDecorationManagerV1 : public QtWayland::zxdg_decoration_manager_v1 { public: QWaylandXdgDecorationManagerV1(struct ::wl_registry *registry, uint32_t id, uint32_t availableVersion); @@ -72,7 +72,7 @@ public: QWaylandXdgToplevelDecorationV1 *createToplevelDecoration(::xdg_toplevel *toplevel); }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgToplevelDecorationV1 : public QtWayland::zxdg_toplevel_decoration_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgToplevelDecorationV1 : public QtWayland::zxdg_toplevel_decoration_v1 { public: QWaylandXdgToplevelDecorationV1(::zxdg_toplevel_decoration_v1 *decoration); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h index 8630fcab957..22a3049251e 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h @@ -74,7 +74,7 @@ class QWaylandDisplay; class QWaylandInputDevice; class QWaylandXdgShell; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface, public QtWayland::xdg_surface +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface, public QtWayland::xdg_surface { Q_OBJECT public: @@ -167,7 +167,7 @@ private: friend class QWaylandXdgShell; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_wm_base +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_wm_base { public: QWaylandXdgShell(QWaylandDisplay *display, uint32_t id, uint32_t availableVersion); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h index fced9eb07c2..91a69342873 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShellIntegration : public QWaylandShellIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgShellIntegration : public QWaylandShellIntegration { public: QWaylandXdgShellIntegration() {} diff --git a/src/plugins/platforms/wayland/qtwaylandclientglobal.h b/src/plugins/platforms/wayland/qtwaylandclientglobal.h index 42f8ec8aac4..32a421f9f1b 100644 --- a/src/plugins/platforms/wayland/qtwaylandclientglobal.h +++ b/src/plugins/platforms/wayland/qtwaylandclientglobal.h @@ -42,17 +42,10 @@ #include #include +#include QT_BEGIN_NAMESPACE -#if !defined(Q_WAYLAND_CLIENT_EXPORT) -# if defined(QT_SHARED) -# define Q_WAYLAND_CLIENT_EXPORT Q_DECL_EXPORT -# else -# define Q_WAYLAND_CLIENT_EXPORT -# endif -#endif - QT_END_NAMESPACE #endif //QWAYLANDCLIENTGLOBAL_H diff --git a/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h b/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h index 5e92f6935cc..a99ac558b4a 100644 --- a/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h +++ b/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h @@ -79,7 +79,7 @@ class QWaylandWindow; class QWaylandInputDevice; class QWaylandAbstractDecorationPrivate; -class Q_WAYLAND_CLIENT_EXPORT QWaylandAbstractDecoration : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandAbstractDecoration : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandAbstractDecoration) diff --git a/src/plugins/platforms/wayland/qwaylandbuffer_p.h b/src/plugins/platforms/wayland/qwaylandbuffer_p.h index 4cfcdfbedea..53acbf7269d 100644 --- a/src/plugins/platforms/wayland/qwaylandbuffer_p.h +++ b/src/plugins/platforms/wayland/qwaylandbuffer_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class Q_WAYLAND_CLIENT_EXPORT QWaylandBuffer { +class Q_WAYLANDCLIENT_EXPORT QWaylandBuffer { public: QWaylandBuffer(); virtual ~QWaylandBuffer(); diff --git a/src/plugins/platforms/wayland/qwaylandclipboard_p.h b/src/plugins/platforms/wayland/qwaylandclipboard_p.h index 1dec2110550..a8f77a1f985 100644 --- a/src/plugins/platforms/wayland/qwaylandclipboard_p.h +++ b/src/plugins/platforms/wayland/qwaylandclipboard_p.h @@ -66,7 +66,7 @@ namespace QtWaylandClient { class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandClipboard : public QPlatformClipboard +class Q_WAYLANDCLIENT_EXPORT QWaylandClipboard : public QPlatformClipboard { public: QWaylandClipboard(QWaylandDisplay *display); diff --git a/src/plugins/platforms/wayland/qwaylandcursor_p.h b/src/plugins/platforms/wayland/qwaylandcursor_p.h index 411e6a3472e..6b08082b81c 100644 --- a/src/plugins/platforms/wayland/qwaylandcursor_p.h +++ b/src/plugins/platforms/wayland/qwaylandcursor_p.h @@ -73,7 +73,7 @@ class QWaylandDisplay; class QWaylandScreen; class QWaylandShm; -class Q_WAYLAND_CLIENT_EXPORT QWaylandCursorTheme +class Q_WAYLANDCLIENT_EXPORT QWaylandCursorTheme { public: static std::unique_ptr create(QWaylandShm *shm, int size, const QString &themeName); @@ -123,7 +123,7 @@ protected: wl_cursor *m_cursors[NumWaylandCursors] = {}; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandCursor : public QPlatformCursor +class Q_WAYLANDCLIENT_EXPORT QWaylandCursor : public QPlatformCursor { public: explicit QWaylandCursor(QWaylandDisplay *display); diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h b/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h index 510d9be48c3..3eb67e5b642 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h +++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h @@ -65,7 +65,7 @@ class QWaylandDataDevice; class QWaylandDataSource; class QWaylandInputDevice; -class Q_WAYLAND_CLIENT_EXPORT QWaylandDataDeviceManager : public QtWayland::wl_data_device_manager +class Q_WAYLANDCLIENT_EXPORT QWaylandDataDeviceManager : public QtWayland::wl_data_device_manager { public: QWaylandDataDeviceManager(QWaylandDisplay *display, int version, uint32_t id); diff --git a/src/plugins/platforms/wayland/qwaylanddataoffer_p.h b/src/plugins/platforms/wayland/qwaylanddataoffer_p.h index bf100193d03..e2f0b4684c7 100644 --- a/src/plugins/platforms/wayland/qwaylanddataoffer_p.h +++ b/src/plugins/platforms/wayland/qwaylanddataoffer_p.h @@ -77,7 +77,7 @@ public: virtual ~QWaylandAbstractDataOffer() = default; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandDataOffer +class Q_WAYLANDCLIENT_EXPORT QWaylandDataOffer : public QtWayland::wl_data_offer // needs to be the first because we do static casts from the user pointer to the wrapper , public QWaylandAbstractDataOffer { diff --git a/src/plugins/platforms/wayland/qwaylanddatasource_p.h b/src/plugins/platforms/wayland/qwaylanddatasource_p.h index 96f07bc3788..4a773e3cd46 100644 --- a/src/plugins/platforms/wayland/qwaylanddatasource_p.h +++ b/src/plugins/platforms/wayland/qwaylanddatasource_p.h @@ -67,7 +67,7 @@ namespace QtWaylandClient { class QWaylandDataDeviceManager; class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandDataSource : public QObject, public QtWayland::wl_data_source +class Q_WAYLANDCLIENT_EXPORT QWaylandDataSource : public QObject, public QtWayland::wl_data_source { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h b/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h index 6afa2d74a58..a71f7d35ef2 100644 --- a/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h +++ b/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h @@ -61,7 +61,7 @@ namespace QtWaylandClient { class QWaylandAbstractDecoration; -class Q_WAYLAND_CLIENT_EXPORT QWaylandDecorationFactory +class Q_WAYLANDCLIENT_EXPORT QWaylandDecorationFactory { public: static QStringList keys(); diff --git a/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h b/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h index 6bda51e8131..9d6cf2a4bb9 100644 --- a/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h +++ b/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h @@ -66,7 +66,7 @@ class QWaylandAbstractDecoration; #define QWaylandDecorationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandDecorationFactoryInterface.5.4" -class Q_WAYLAND_CLIENT_EXPORT QWaylandDecorationPlugin : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandDecorationPlugin : public QObject { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylanddisplay_p.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h index 5a83c3241ba..daef31e522c 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay_p.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h @@ -90,7 +90,7 @@ namespace QtWayland { namespace QtWaylandClient { -Q_WAYLAND_CLIENT_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcQpaWayland); +Q_WAYLANDCLIENT_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcQpaWayland); class QWaylandInputDevice; class QWaylandBuffer; @@ -123,7 +123,7 @@ typedef void (*RegistryListener)(void *data, const QString &interface, uint32_t version); -class Q_WAYLAND_CLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland::wl_registry { +class Q_WAYLANDCLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland::wl_registry { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylanddnd_p.h b/src/plugins/platforms/wayland/qwaylanddnd_p.h index 46f629ace19..4605b1a8e8d 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd_p.h +++ b/src/plugins/platforms/wayland/qwaylanddnd_p.h @@ -65,7 +65,7 @@ namespace QtWaylandClient { class QWaylandDisplay; #if QT_CONFIG(draganddrop) -class Q_WAYLAND_CLIENT_EXPORT QWaylandDrag : public QBasicDrag +class Q_WAYLANDCLIENT_EXPORT QWaylandDrag : public QBasicDrag { public: QWaylandDrag(QWaylandDisplay *display); diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h b/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h index 7748feb7aea..f80e79759e9 100644 --- a/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h +++ b/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h @@ -67,7 +67,7 @@ namespace QtWaylandClient { class QWaylandDisplay; class QWaylandWindow; -class Q_WAYLAND_CLIENT_EXPORT QWaylandExtendedSurface : public QtWayland::qt_extended_surface +class Q_WAYLANDCLIENT_EXPORT QWaylandExtendedSurface : public QtWayland::qt_extended_surface { public: QWaylandExtendedSurface(QWaylandWindow *window); diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice_p.h b/src/plugins/platforms/wayland/qwaylandinputdevice_p.h index a6b69c989e5..b27fc09a460 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice_p.h +++ b/src/plugins/platforms/wayland/qwaylandinputdevice_p.h @@ -105,7 +105,7 @@ class CursorSurface; Q_DECLARE_LOGGING_CATEGORY(lcQpaWaylandInput); -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDevice : public QObject , public QtWayland::wl_seat { @@ -231,7 +231,7 @@ inline uint32_t QWaylandInputDevice::serial() const } -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice::Keyboard : public QObject, public QtWayland::wl_keyboard +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDevice::Keyboard : public QObject, public QtWayland::wl_keyboard { Q_OBJECT @@ -308,7 +308,7 @@ private: friend class QWaylandInputDevice; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice::Pointer : public QObject, public QtWayland::wl_pointer +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDevice::Pointer : public QObject, public QtWayland::wl_pointer { Q_OBJECT public: @@ -400,7 +400,7 @@ private: //TODO: should other methods be private as well? bool isDefinitelyTerminated(axis_source source) const; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice::Touch : public QtWayland::wl_touch +class Q_WAYLANDCLIENT_EXPORT QWaylandInputDevice::Touch : public QtWayland::wl_touch { public: Touch(QWaylandInputDevice *p); diff --git a/src/plugins/platforms/wayland/qwaylandintegration_p.h b/src/plugins/platforms/wayland/qwaylandintegration_p.h index 750440a9c34..33b78012c42 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration_p.h +++ b/src/plugins/platforms/wayland/qwaylandintegration_p.h @@ -71,7 +71,7 @@ class QWaylandInputDevice; class QWaylandScreen; class QWaylandCursor; -class Q_WAYLAND_CLIENT_EXPORT QWaylandIntegration : public QPlatformIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandIntegration : public QPlatformIntegration { public: QWaylandIntegration(); diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h index a2d26ef7644..a070de40998 100644 --- a/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h +++ b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h @@ -65,7 +65,7 @@ namespace QtWaylandClient { class QWaylandIntegration; class QWaylandScreen; -class Q_WAYLAND_CLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeInterface +class Q_WAYLANDCLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeInterface { public: QWaylandNativeInterface(QWaylandIntegration *integration); diff --git a/src/plugins/platforms/wayland/qwaylandpointergestures_p.h b/src/plugins/platforms/wayland/qwaylandpointergestures_p.h index c9aa3ac35ec..8a906741a77 100644 --- a/src/plugins/platforms/wayland/qwaylandpointergestures_p.h +++ b/src/plugins/platforms/wayland/qwaylandpointergestures_p.h @@ -68,7 +68,7 @@ class QWaylandInputDevice; class QWaylandPointerGestureSwipe; class QWaylandPointerGesturePinch; -class Q_WAYLAND_CLIENT_EXPORT QWaylandPointerGestures : public QtWayland::zwp_pointer_gestures_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandPointerGestures : public QtWayland::zwp_pointer_gestures_v1 { public: explicit QWaylandPointerGestures(QWaylandDisplay *display, uint id, uint version); @@ -77,7 +77,7 @@ public: QWaylandPointerGesturePinch *createPointerGesturePinch(QWaylandInputDevice *device); }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandPointerGestureSwipe : +class Q_WAYLANDCLIENT_EXPORT QWaylandPointerGestureSwipe : public QtWayland::zwp_pointer_gesture_swipe_v1 { public: @@ -107,7 +107,7 @@ public: uint mFingers = 0; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandPointerGesturePinch : +class Q_WAYLANDCLIENT_EXPORT QWaylandPointerGesturePinch : public QtWayland::zwp_pointer_gesture_pinch_v1 { public: diff --git a/src/plugins/platforms/wayland/qwaylandprimaryselectionv1_p.h b/src/plugins/platforms/wayland/qwaylandprimaryselectionv1_p.h index 3f0a42a6702..16906fd2fa7 100644 --- a/src/plugins/platforms/wayland/qwaylandprimaryselectionv1_p.h +++ b/src/plugins/platforms/wayland/qwaylandprimaryselectionv1_p.h @@ -96,7 +96,7 @@ private: QScopedPointer m_mimeData; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandPrimarySelectionSourceV1 : public QObject, public QtWayland::zwp_primary_selection_source_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandPrimarySelectionSourceV1 : public QObject, public QtWayland::zwp_primary_selection_source_v1 { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylandqtkey_p.h b/src/plugins/platforms/wayland/qwaylandqtkey_p.h index 8c8d959266b..1355f3f338f 100644 --- a/src/plugins/platforms/wayland/qwaylandqtkey_p.h +++ b/src/plugins/platforms/wayland/qwaylandqtkey_p.h @@ -63,7 +63,7 @@ namespace QtWaylandClient { class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandQtKeyExtension : public QtWayland::zqt_key_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandQtKeyExtension : public QtWayland::zqt_key_v1 { public: QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_t id); diff --git a/src/plugins/platforms/wayland/qwaylandscreen_p.h b/src/plugins/platforms/wayland/qwaylandscreen_p.h index c4bf724da33..1cece249fa9 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen_p.h +++ b/src/plugins/platforms/wayland/qwaylandscreen_p.h @@ -65,12 +65,12 @@ namespace QtWaylandClient { class QWaylandDisplay; class QWaylandCursor; -class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgOutputManagerV1 : public QtWayland::zxdg_output_manager_v1 { +class Q_WAYLANDCLIENT_EXPORT QWaylandXdgOutputManagerV1 : public QtWayland::zxdg_output_manager_v1 { public: QWaylandXdgOutputManagerV1(QWaylandDisplay *display, uint id, uint version); }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandScreen : public QPlatformScreen, QtWayland::wl_output, QtWayland::zxdg_output_v1 +class Q_WAYLANDCLIENT_EXPORT QWaylandScreen : public QPlatformScreen, QtWayland::wl_output, QtWayland::zxdg_output_v1 { public: QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id); diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h index e7d2ed31920..0cd24036d62 100644 --- a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h +++ b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h @@ -70,7 +70,7 @@ namespace QtWaylandClient { class QWaylandWindow; class QWaylandInputDevice; -class Q_WAYLAND_CLIENT_EXPORT QWaylandShellSurface : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandShellSurface : public QObject { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylandshm_p.h b/src/plugins/platforms/wayland/qwaylandshm_p.h index b6c45420563..45c1fedf001 100644 --- a/src/plugins/platforms/wayland/qwaylandshm_p.h +++ b/src/plugins/platforms/wayland/qwaylandshm_p.h @@ -64,7 +64,7 @@ namespace QtWaylandClient { class QWaylandDisplay; -class Q_WAYLAND_CLIENT_EXPORT QWaylandShm : public QtWayland::wl_shm +class Q_WAYLANDCLIENT_EXPORT QWaylandShm : public QtWayland::wl_shm { public: diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h b/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h index f3fae438016..993a394a50b 100644 --- a/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h +++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h @@ -68,7 +68,7 @@ class QWaylandDisplay; class QWaylandAbstractDecoration; class QWaylandWindow; -class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBuffer : public QWaylandBuffer { +class Q_WAYLANDCLIENT_EXPORT QWaylandShmBuffer : public QWaylandBuffer { public: QWaylandShmBuffer(QWaylandDisplay *display, const QSize &size, QImage::Format format, qreal scale = 1); @@ -85,7 +85,7 @@ private: QImage *mMarginsImage = nullptr; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBackingStore : public QPlatformBackingStore +class Q_WAYLANDCLIENT_EXPORT QWaylandShmBackingStore : public QPlatformBackingStore { public: QWaylandShmBackingStore(QWindow *window, QWaylandDisplay *display); diff --git a/src/plugins/platforms/wayland/qwaylandshmwindow_p.h b/src/plugins/platforms/wayland/qwaylandshmwindow_p.h index 81251b3aa96..eebff94c64a 100644 --- a/src/plugins/platforms/wayland/qwaylandshmwindow_p.h +++ b/src/plugins/platforms/wayland/qwaylandshmwindow_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class Q_WAYLAND_CLIENT_EXPORT QWaylandShmWindow : public QWaylandWindow +class Q_WAYLANDCLIENT_EXPORT QWaylandShmWindow : public QWaylandWindow { public: QWaylandShmWindow(QWindow *window, QWaylandDisplay *display); diff --git a/src/plugins/platforms/wayland/qwaylandsubsurface_p.h b/src/plugins/platforms/wayland/qwaylandsubsurface_p.h index 1399f16e080..a6b25f90231 100644 --- a/src/plugins/platforms/wayland/qwaylandsubsurface_p.h +++ b/src/plugins/platforms/wayland/qwaylandsubsurface_p.h @@ -64,7 +64,7 @@ namespace QtWaylandClient { class QWaylandDisplay; class QWaylandWindow; -class Q_WAYLAND_CLIENT_EXPORT QWaylandSubSurface : public QtWayland::wl_subsurface +class Q_WAYLANDCLIENT_EXPORT QWaylandSubSurface : public QtWayland::wl_subsurface { public: QWaylandSubSurface(QWaylandWindow *window, QWaylandWindow *parent, ::wl_subsurface *subsurface); diff --git a/src/plugins/platforms/wayland/qwaylandtabletv2_p.h b/src/plugins/platforms/wayland/qwaylandtabletv2_p.h index bf3c78f0522..870d236d699 100644 --- a/src/plugins/platforms/wayland/qwaylandtabletv2_p.h +++ b/src/plugins/platforms/wayland/qwaylandtabletv2_p.h @@ -74,14 +74,14 @@ class QWaylandTabletV2; class QWaylandTabletToolV2; class QWaylandTabletPadV2; -class Q_WAYLAND_CLIENT_EXPORT QWaylandTabletManagerV2 : public QtWayland::zwp_tablet_manager_v2 +class Q_WAYLANDCLIENT_EXPORT QWaylandTabletManagerV2 : public QtWayland::zwp_tablet_manager_v2 { public: explicit QWaylandTabletManagerV2(QWaylandDisplay *display, uint id, uint version); QWaylandTabletSeatV2 *createTabletSeat(QWaylandInputDevice *seat); }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandTabletSeatV2 : public QObject, public QtWayland::zwp_tablet_seat_v2 +class Q_WAYLANDCLIENT_EXPORT QWaylandTabletSeatV2 : public QObject, public QtWayland::zwp_tablet_seat_v2 { Q_OBJECT public: @@ -99,7 +99,7 @@ private: QList m_pads; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandTabletV2 : public QObject, public QtWayland::zwp_tablet_v2 +class Q_WAYLANDCLIENT_EXPORT QWaylandTabletV2 : public QObject, public QtWayland::zwp_tablet_v2 { Q_OBJECT public: @@ -113,7 +113,7 @@ protected: void zwp_tablet_v2_removed() override; }; -class Q_WAYLAND_CLIENT_EXPORT QWaylandTabletToolV2 : public QObject, public QtWayland::zwp_tablet_tool_v2 +class Q_WAYLANDCLIENT_EXPORT QWaylandTabletToolV2 : public QObject, public QtWayland::zwp_tablet_tool_v2 { Q_OBJECT public: @@ -168,7 +168,7 @@ private: }; // We don't actually use this, but need to handle the "removed" event to comply with the protocol -class Q_WAYLAND_CLIENT_EXPORT QWaylandTabletPadV2 : public QObject, public QtWayland::zwp_tablet_pad_v2 +class Q_WAYLANDCLIENT_EXPORT QWaylandTabletPadV2 : public QObject, public QtWayland::zwp_tablet_pad_v2 { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylandtouch_p.h b/src/plugins/platforms/wayland/qwaylandtouch_p.h index 53cc43d80c2..b23c4c1faab 100644 --- a/src/plugins/platforms/wayland/qwaylandtouch_p.h +++ b/src/plugins/platforms/wayland/qwaylandtouch_p.h @@ -64,7 +64,7 @@ namespace QtWaylandClient { class QWaylandDisplay; class QWaylandInputDevice; -class Q_WAYLAND_CLIENT_EXPORT QWaylandTouchExtension : public QtWayland::qt_touch_extension +class Q_WAYLANDCLIENT_EXPORT QWaylandTouchExtension : public QtWayland::qt_touch_extension { public: QWaylandTouchExtension(QWaylandDisplay *display, uint32_t id); diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h index 102db1b43c1..5f51743d96d 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow_p.h +++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h @@ -90,7 +90,7 @@ class QWaylandPointerGestureSwipeEvent; class QWaylandPointerGesturePinchEvent; class QWaylandSurface; -class Q_WAYLAND_CLIENT_EXPORT QWaylandWindow : public QObject, public QPlatformWindow +class Q_WAYLANDCLIENT_EXPORT QWaylandWindow : public QObject, public QPlatformWindow { Q_OBJECT public: diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h index 1c36f67bb18..c3c01352c34 100644 --- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h +++ b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h @@ -68,7 +68,7 @@ class QWaylandDisplay; class QWaylandWindowManagerIntegrationPrivate; -class Q_WAYLAND_CLIENT_EXPORT QWaylandWindowManagerIntegration : public QObject, public QGenericUnixServices, public QtWayland::qt_windowmanager +class Q_WAYLANDCLIENT_EXPORT QWaylandWindowManagerIntegration : public QObject, public QGenericUnixServices, public QtWayland::qt_windowmanager { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandWindowManagerIntegration) diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h index 68b90cda562..06abcb7e5e4 100644 --- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h +++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h @@ -72,7 +72,7 @@ class QWaylandWindow; class QWaylandDisplay; class QWaylandShellSurface; -class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegration { public: QWaylandShellIntegration() {} @@ -91,7 +91,7 @@ public: }; template -class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationTemplate : public QWaylandShellIntegration, public QWaylandClientExtension +class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationTemplate : public QWaylandShellIntegration, public QWaylandClientExtension { public: QWaylandShellIntegrationTemplate(const int ver) : diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h index 0268dba48bc..dd9dd788fc2 100644 --- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h +++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h @@ -63,7 +63,7 @@ namespace QtWaylandClient { class QWaylandShellIntegration; -class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationFactory +class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationFactory { public: static QStringList keys(); diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h index 7c5a9e74ceb..6f116085826 100644 --- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h +++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h @@ -66,7 +66,7 @@ class QWaylandShellIntegration; #define QWaylandShellIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandShellIntegrationFactoryInterface.5.3" -class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationPlugin : public QObject +class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationPlugin : public QObject { Q_OBJECT public: