diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-01-29 14:35:44 +0200 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-01-29 12:53:04 +0000 |
commit | e6255beec9114afd1fad9e7d62ebec433a627d54 (patch) | |
tree | e03655b01f480e4e82686ad02318f241a21f0002 /src/hardwareintegration/client/xcomposite_share | |
parent | 1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (diff) |
Namespace the platform plugins
There currently is a QWaylandInputDevice class both in the wayland QPA
plugin and in the QtCompositor API. This causes the qwindow-compositor
example to crash when running nested in a wayland session due to a
mismatch between the two classes.
By namespacing all the plugin code we make sure that name clashes
will not happen anymore.
Change-Id: I17497cff697599200bea68bf01dfde474526390f
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/hardwareintegration/client/xcomposite_share')
-rw-r--r-- | src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp | 4 | ||||
-rw-r--r-- | src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp index 94a9772ad..6aa27adbf 100644 --- a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp +++ b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +namespace QtWaylandClient { + QWaylandXCompositeBuffer::QWaylandXCompositeBuffer(qt_xcomposite *xcomposite, uint32_t window, const QSize &size) :mSize(size) { @@ -60,4 +62,6 @@ QSize QWaylandXCompositeBuffer::size() const return mSize; } +} + QT_END_NAMESPACE diff --git a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h index a2f421666..7161cad5d 100644 --- a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h +++ b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h @@ -50,6 +50,8 @@ struct wl_visual; QT_BEGIN_NAMESPACE +namespace QtWaylandClient { + class QWaylandXCompositeBuffer : public QWaylandBuffer { public: @@ -62,6 +64,8 @@ private: QSize mSize; }; +} + QT_END_NAMESPACE #endif // QWAYLANDXCOMPOSITEBUFFER_H |