diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-02-11 17:26:17 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-02-15 14:00:48 +0000 |
| commit | 434c582cf58e43c6ebbca801eddf157710340d7c (patch) | |
| tree | 4333a4da818db74494e779883e9a9571e268b0db /src/compositor/global | |
| parent | 74b1ec474d1d48242893dcaf58b8a35f155f3fc3 (diff) | |
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>
Diffstat (limited to 'src/compositor/global')
| -rw-r--r-- | src/compositor/global/qwaylandexport.h | 8 | ||||
| -rw-r--r-- | src/compositor/global/qwaylandextension.h | 6 | ||||
| -rw-r--r-- | src/compositor/global/qwaylandextension_p.h | 4 | ||||
| -rw-r--r-- | src/compositor/global/qwaylandquickextension.h | 4 |
4 files changed, 11 insertions, 11 deletions
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 \ |