diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2022-04-22 13:54:11 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-04-28 20:57:04 -0700 |
commit | e1854451c46513fcfad0f92abc836b9cb6fa454a (patch) | |
tree | 8103972a9a9930e697cc5cba36cbee95cfa6d6cc /src/client/qtwaylandclientglobal.h | |
parent | aee5dbf01c24a1487847d996647b0c53f1f20e8b (diff) |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/client/qtwaylandclientglobal.h')
-rw-r--r-- | src/client/qtwaylandclientglobal.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/client/qtwaylandclientglobal.h b/src/client/qtwaylandclientglobal.h index 42f8ec8aa..32a421f9f 100644 --- a/src/client/qtwaylandclientglobal.h +++ b/src/client/qtwaylandclientglobal.h @@ -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 |