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 | 0dc189a432779d5840a8e1847a24b898daf6f3c5 (patch) | |
| tree | 370a5262a310737440bdd6e7cc01b6ea9c5f9891 /src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp | |
| parent | 726e478bbeffb3c174d82bcd5621e917fc959fc8 (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/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp index 469f80360f3..c02eebf3a2a 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp @@ -44,6 +44,8 @@ #include "qwaylanddisplay_p.h" QT_BEGIN_NAMESPACE +namespace QtWaylandClient { + QWaylandHardwareIntegration::QWaylandHardwareIntegration(struct ::wl_registry *registry, int id) : qt_hardware_integration(registry, id, 1) { @@ -69,4 +71,6 @@ void QWaylandHardwareIntegration::hardware_integration_server_backend(const QStr m_server_buffer = name; } +} + QT_END_NAMESPACE |