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/client/qwaylandscreen.cpp | |
| 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/client/qwaylandscreen.cpp')
| -rw-r--r-- | src/client/qwaylandscreen.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index 675c84042..a1aff8d1c 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/qwaylandscreen.cpp @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE +namespace QtWaylandClient { + QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id) : QPlatformScreen() , QtWayland::wl_output(waylandDisplay->wl_registry(), id, qMin(version, 2)) @@ -242,4 +244,6 @@ void QWaylandScreen::output_done() QWindowSystemInterface::handleScreenRefreshRateChange(screen(), refreshRate()); } +} + QT_END_NAMESPACE |