1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtWaylandClient: use the CMake exports.h support

Browse Source 
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Thiago Macieira 2022-04-22 13:54:11 -07:00
parent 27c6c16743
commit 66217476bb
54 changed files with 74 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -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

4
src/plugins/platforms/wayland/global/qwaylandclientextension.h
View File

@ -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 <typename T>
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionTemplate : public QWaylandClientExtension
class Q_WAYLANDCLIENT_EXPORT QWaylandClientExtensionTemplate : public QWaylandClientExtension
{
Q_DECLARE_PRIVATE(QWaylandClientExtensionTemplate)
public:

4
src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
View File

@ -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()

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
View File

@ -65,7 +65,7 @@ namespace QtWaylandClient {
class QWaylandWindow;
class QWaylandDisplay;
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegration
class Q_WAYLANDCLIENT_EXPORT QWaylandClientBufferIntegration
{
public:
QWaylandClientBufferIntegration();

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
View File

@ -61,7 +61,7 @@ namespace QtWaylandClient {
class QWaylandClientBufferIntegration;
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegrationFactory
class Q_WAYLANDCLIENT_EXPORT QWaylandClientBufferIntegrationFactory
{
public:
static QStringList keys();

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h
View File

@ -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);

4
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
View File

@ -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();

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
View File

@ -61,7 +61,7 @@ namespace QtWaylandClient {
class QWaylandServerBufferIntegration;
class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegrationFactory
class Q_WAYLANDCLIENT_EXPORT QWaylandServerBufferIntegrationFactory
{
public:
static QStringList keys();

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
View File

@ -63,7 +63,7 @@ namespace QtWaylandClient {
class QWaylandDisplay;
class QWaylandInputDevice;
class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegration
class Q_WAYLANDCLIENT_EXPORT QWaylandInputDeviceIntegration
{
public:
QWaylandInputDeviceIntegration() {}

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
View File

@ -61,7 +61,7 @@ namespace QtWaylandClient {
class QWaylandInputDeviceIntegration;
class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegrationFactory
class Q_WAYLANDCLIENT_EXPORT QWaylandInputDeviceIntegrationFactory
{
public:
static QStringList keys();

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp
View File

@ -68,7 +68,7 @@ enum Button
Minimize
};
class Q_WAYLAND_CLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstractDecoration
class Q_WAYLANDCLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstractDecoration
{
public:
QWaylandBradientDecoration();

2
src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1integration.h
View File

@ -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;

2
src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/qwaylandfullscreenshellv1surface.h
View File

@ -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);

2
src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellintegration_p.h
View File

@ -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() {}

2
src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h
View File

@ -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

4
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgactivationv1_p.h
View File

@ -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);

4
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1_p.h
View File

@ -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);

4
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h
View File

@ -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() {}

9
src/plugins/platforms/wayland/qtwaylandclientglobal.h
View File

@ -42,17 +42,10 @@
#include <QtGui/qtguiglobal.h>
#include <QtWaylandClient/qtwaylandclient-config.h>
#include <QtWaylandClient/qtwaylandclientexports.h>
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

2
src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h
View File

@ -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)

2
src/plugins/platforms/wayland/qwaylandbuffer_p.h
View File

@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
class Q_WAYLAND_CLIENT_EXPORT QWaylandBuffer {
class Q_WAYLANDCLIENT_EXPORT QWaylandBuffer {
public:
QWaylandBuffer();
virtual ~QWaylandBuffer();

2
src/plugins/platforms/wayland/qwaylandclipboard_p.h
View File

@ -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);

4
src/plugins/platforms/wayland/qwaylandcursor_p.h
View File

@ -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<QWaylandCursorTheme> 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);

2
src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylanddataoffer_p.h
View File

@ -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
{

2
src/plugins/platforms/wayland/qwaylanddatasource_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h
View File

@ -61,7 +61,7 @@ namespace QtWaylandClient {
class QWaylandAbstractDecoration;
class Q_WAYLAND_CLIENT_EXPORT QWaylandDecorationFactory
class Q_WAYLANDCLIENT_EXPORT QWaylandDecorationFactory
{
public:
static QStringList keys();

2
src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h
View File

@ -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:

4
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/qwaylanddnd_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylandextendedsurface_p.h
View File

@ -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);

8
src/plugins/platforms/wayland/qwaylandinputdevice_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylandintegration_p.h
View File

@ -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();

2
src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
View File

@ -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);

6
src/plugins/platforms/wayland/qwaylandpointergestures_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/qwaylandprimaryselectionv1_p.h
View File

@ -96,7 +96,7 @@ private:
QScopedPointer<QWaylandMimeData> 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:

2
src/plugins/platforms/wayland/qwaylandqtkey_p.h
View File

@ -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);

4
src/plugins/platforms/wayland/qwaylandscreen_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylandshellsurface_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/qwaylandshm_p.h
View File

@ -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:

4
src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylandshmwindow_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylandsubsurface_p.h
View File

@ -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);

10
src/plugins/platforms/wayland/qwaylandtabletv2_p.h
View File

@ -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<QWaylandTabletPadV2 *> 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:

2
src/plugins/platforms/wayland/qwaylandtouch_p.h
View File

@ -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);

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -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:

2
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
View File

@ -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)

4
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
View File

@ -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 <typename T>
class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationTemplate : public QWaylandShellIntegration, public QWaylandClientExtension
class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationTemplate : public QWaylandShellIntegration, public QWaylandClientExtension
{
public:
QWaylandShellIntegrationTemplate(const int ver) :

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h
View File

@ -63,7 +63,7 @@ namespace QtWaylandClient {
class QWaylandShellIntegration;
class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationFactory
class Q_WAYLANDCLIENT_EXPORT QWaylandShellIntegrationFactory
{
public:
static QStringList keys();

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h
View File

@ -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: