From e6255beec9114afd1fad9e7d62ebec433a627d54 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Thu, 29 Jan 2015 14:35:44 +0200 Subject: Namespace the platform plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/client/qwaylandscreen.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/client/qwaylandscreen.cpp') 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 -- cgit v1.2.3