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/qwaylandxdgshell_p.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/client/qwaylandxdgshell_p.h') diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h index 6a396bd11..f2e2e7bb4 100644 --- a/src/client/qwaylandxdgshell_p.h +++ b/src/client/qwaylandxdgshell_p.h @@ -52,9 +52,12 @@ QT_BEGIN_NAMESPACE +class QWindow; + +namespace QtWaylandClient { + class QWaylandWindow; class QWaylandInputDevice; -class QWindow; class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_shell { @@ -70,4 +73,6 @@ private: QT_END_NAMESPACE +} + #endif // QWAYLANDXDGSHELL_H -- cgit v1.2.3